4 files changed, 13 insertions, 13 deletions
diff --git a/testsuite/runnable/generic_base.elna b/testsuite/runnable/generic_base.elna
index 161c59d..7b371ad 100644
--- a/testsuite/runnable/generic_base.elna
+++ b/testsuite/runnable/generic_base.elna
@@ -36,5 +36,5 @@ begin
   assert(jobs.count = 1u);
   assert(jobs.head = @f);
   assert(jobs.tail = @f);
-  assert(#size(Queue#[File]) = #size(Pointer) * 3u)
+  assert(#size(Queue#[File]) = #size(^Word8) * 3u)
 end.
diff --git a/testsuite/runnable/generic_pointer_arithmetic.elna b/testsuite/runnable/generic_pointer_arithmetic.elna
index 209287d..abbca4b 100644
--- a/testsuite/runnable/generic_pointer_arithmetic.elna
+++ b/testsuite/runnable/generic_pointer_arithmetic.elna
@@ -2,13 +2,13 @@ program()
 var
   base: [4]Int
   element: ^Int
-  first: Pointer
-  second: Pointer
+  first: ^Word8
+  second: ^Word8
 
 begin
   element := base.ptr;
-  first := element;
+  first := cast(element: ^Word8);
   second := first + 1;
-  assert(cast(second : Word) - cast(first : Word) = 1u);
+  assert(cast(second: Word) - cast(first: Word) = 1u);
   assert(second - 1 = first)
 end.
diff --git a/testsuite/runnable/procedure_cast.elna b/testsuite/runnable/procedure_cast.elna
index d724e38..0e8aa92 100644
--- a/testsuite/runnable/procedure_cast.elna
+++ b/testsuite/runnable/procedure_cast.elna
@@ -7,5 +7,5 @@ return 42
 
 begin
   cb := cast(@probe_int: ^proc(x: ^Char) -> Int);
-  assert(cb^(nil) = 42)
+  assert(cb^(cast(0u: ^Char)) = 42)
 end.
diff --git a/testsuite/runnable/recursive_record.elna b/testsuite/runnable/recursive_record.elna
index 48fb873..1667bf4 100644
--- a/testsuite/runnable/recursive_record.elna
+++ b/testsuite/runnable/recursive_record.elna
@@ -10,10 +10,10 @@ var
   second: ^Node
   third: ^Node
 
-proc malloc(size: Word) -> Pointer
+proc malloc#[T](size: Word) -> ^T
 extern
 
-proc free(ptr: Pointer)
+proc free#[T](ptr: ^T)
 extern
 
 proc sum(node: ^Node) -> Int
@@ -21,7 +21,7 @@ var
   result: Int
 begin
   result := 0;
-  if node = nil then
+  if node = cast(0u: ^Node) then
     result := 0
   else
     result := node^.value + sum(node^.next)
@@ -29,16 +29,16 @@ begin
 return result
 
 begin
-  first := malloc(#size(Node));
-  second := malloc(#size(Node));
-  third := malloc(#size(Node));
+  first := malloc#[Node](#size(Node));
+  second := malloc#[Node](#size(Node));
+  third := malloc#[Node](#size(Node));
 
   first^.value := 1;
   first^.next := second;
   second^.value := 2;
   second^.next := third;
   third^.value := 3;
-  third^.next := nil;
+  third^.next := cast(0u: ^Node);
 
   assert(sum(first) = 6);
   assert(first^.next^.next^.value = 3);