diff --git a/test/good/t2.ept b/test/good/t2.ept
index 9f92619..c4a695e 100644
--- a/test/good/t2.ept
+++ b/test/good/t2.ept
@@ -32,7 +32,7 @@ node g(x: bool) returns (o: bool)
   tel
 
 node hhh() returns ()
-  var last o': int;
+  var last o' : int = 0;
   let
     automaton
       state S1
diff --git a/test/good/t2open.ept b/test/good/t2open.ept
index db9fcbc..9c44cb9 100644
--- a/test/good/t2open.ept
+++ b/test/good/t2open.ept
@@ -31,7 +31,7 @@ node h(x,z,m:int) returns (o:int)
         until (1 = 0) then S2
     end;
     present
-      | (x = 0) do o = pre o + 2
+      | (x = 0) do o = 2 -> pre o + 2
       | (x = 2) do o = 4
     default do o = 2
     end
diff --git a/test/good/t6.ept b/test/good/t6.ept
index 6fc1826..546617a 100644
--- a/test/good/t6.ept
+++ b/test/good/t6.ept
@@ -3,8 +3,14 @@ node f(x,z:int) returns (o1,o2:int)
   var o4:int;
   let
     switch (x = z)
-      | true do o1 = pre o1 + 2;o2 = o4+1;o4 = 3
-      | false do o1 = 4;o2 = 5;o4 = 5
+      | true do
+          o1 = 0 -> pre o1 + 2;
+	  o2 = o4 + 1;
+	  o4 = 3
+      | false do
+          o1 = 4;
+	  o2 = 5;
+	  o4 = 5
     end;
   tel