1 files changed, 17 insertions, 16 deletions

diff --git a/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/src/test/java/com/seaofnodes/simple/Chapter09Test.java
index 048a58c7..2abce3cb 100644
--- a/src/test/java/com/seaofnodes/simple/Chapter09Test.java
+++ b/src/test/java/com/seaofnodes/simple/Chapter09Test.java
@@ -70,7 +70,7 @@ while (arg < 10) {
 return arg;
                 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Loop7,arg,(Phi_arg+2));", stop.toString());
+        assertEquals("return Phi(Loop9,arg,(Phi_arg+2));", stop.toString());
         Assert.assertEquals(11L, Evaluator.evaluate(stop, 1));
     }
 
@@ -87,7 +87,7 @@ while (arg < 10) {
 return arg;
                 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Loop8,arg,(Phi_arg+4));", stop.toString());
+        assertEquals("return Phi(Loop10,arg,(Phi_arg+4));", stop.toString());
         Assert.assertEquals(13L, Evaluator.evaluate(stop, 1));
     }
 
@@ -116,7 +116,7 @@ while (arg) {
 return arg;
                 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Loop14,arg,(Phi_arg+1));", stop.toString());
+        assertEquals("return Phi(Loop16,arg,(Phi_arg+1));", stop.toString());
     }
 
     @Test
@@ -134,14 +134,14 @@ while(v1+arg) {
 }
                 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("Stop[ return 0; return 0; ]", stop.toString());
     }
 
     @Test
     public void testWhile0() {
         Parser parser = new Parser("while(0) continue; if(0) arg=0;");
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
     @Test
@@ -153,7 +153,7 @@ if(0) while(0) {
 }
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
 
@@ -186,7 +186,7 @@ while(arg) {
 return a;
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Loop9,0,(-(Phi_a+3)));", stop.toString());
+        assertEquals("return Phi(Loop11,0,(-(Phi_a+3)));", stop.toString());
     }
 
     @Test
@@ -200,7 +200,7 @@ int v0=0!=0<-0;
 return -0+0+0;
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
 
@@ -215,7 +215,7 @@ return -0+0+0;
     public void testFuzz3() {
         Parser parser = new Parser("int v0=0; while(0==69) while(v0) return 0;");
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
     @Test
@@ -227,7 +227,7 @@ while(1) {
 }
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
     @Test
@@ -249,18 +249,19 @@ while(1) {
 return 0!=0;
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
     @Test
     public void testFuzz6() {
-        Parser parser = new Parser("""
+        Parser parser = new Parser(
+"""
 int v0=0;
 while(0==1) while(v0)
         v0=1+v0;
-                                   """);
+""");
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
     @Test
@@ -276,14 +277,14 @@ while(1)
 return v1+v0;
                                    """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ ]", stop.toString());
+        assertEquals("return 0;", stop.toString());
     }
 
     @Test
     public void testFuzz8() {
         Parser parser = new Parser("while(arg) arg = arg - 1;  return arg;");
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Loop6,arg,(Phi_arg-1));", stop.toString());
+        assertEquals("return Phi(Loop8,arg,(Phi_arg-1));", stop.toString());
     }
 
     @Test