diff --git a/modeling/testModelCheckerAvatar/testClocks.xml b/modeling/testModelCheckerAvatar/testClocks.xml
index b912f6e9097365e16e4f66538e8cf9fbe49f26d4..4985548eed3132e8bb31b8b319144e2cf1debde3 100644
--- a/modeling/testModelCheckerAvatar/testClocks.xml
+++ b/modeling/testModelCheckerAvatar/testClocks.xml
@@ -2917,7 +2917,7 @@
 <MainCode value="}"/>
 <Optimized value="true" />
 <considerTimingOperators value="true" />
-<Validated value="" />
+<Validated value="Block1;Block0;Block;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="1480" index="0" uid="1af3c954-8366-4172-b898-254ca7efa1b5" >
diff --git a/ttool/src/test/java/cli/CLIAvatarModelCheckerTest.java b/ttool/src/test/java/cli/CLIAvatarModelCheckerTest.java
index c981b070b1cc70d2fb010563719e580771687370..7a90e9266d8920421a778d1e4fb5c75fe400537a 100644
--- a/ttool/src/test/java/cli/CLIAvatarModelCheckerTest.java
+++ b/ttool/src/test/java/cli/CLIAvatarModelCheckerTest.java
@@ -115,8 +115,8 @@ public class CLIAvatarModelCheckerTest extends AbstractTest implements Interpret
 
         System.out.println("states=" + graph.getNbOfStates() + " transitions=" +
                 graph.getNbOfTransitions());
-        assertTrue(graph.getNbOfStates() == 7);
-        assertTrue(graph.getNbOfTransitions() == 7);
+        assertTrue(graph.getNbOfStates() == 14);
+        assertTrue(graph.getNbOfTransitions() == 16);
 
 
         // Graph minimization
@@ -156,7 +156,8 @@ public class CLIAvatarModelCheckerTest extends AbstractTest implements Interpret
         graph.computeStates();
 
         System.out.println("states=" + graph.getNbOfStates() + " transitions=" + graph.getNbOfTransitions());
-        assertTrue(graph.getNbOfStates() == 7);
+        assertTrue(graph.getNbOfStates() == 12);
+        assertTrue(graph.getNbOfTransitions() > 10);
     }
 	
 	@Test
@@ -194,8 +195,8 @@ public class CLIAvatarModelCheckerTest extends AbstractTest implements Interpret
         String expectedOutput = myutil.FileUtils.loadFileData(f);
 
         System.out.println("states=" + graph.getNbOfStates() + " transitions=" + graph.getNbOfTransitions());
-        assertTrue(graph.getNbOfStates() == 7);
-        assertTrue(graph.getNbOfTransitions() == 7);
+        assertTrue(graph.getNbOfStates() == 14);
+        assertTrue(graph.getNbOfTransitions() == 16);
         assertEquals(expectedOutput, outputResult.toString());
     }
 	
@@ -236,7 +237,7 @@ public class CLIAvatarModelCheckerTest extends AbstractTest implements Interpret
         System.out.println("states=" + graph.getNbOfStates() + " transitions=" + graph.getNbOfTransitions());
         assertTrue(graph.getNbOfStates() == 251);
         assertTrue(graph.getNbOfTransitions() > 700);
-        assertTrue(graph.getNbOfTransitions() < 750);
+        assertTrue(graph.getNbOfTransitions() < 770);
 
         String s1 = expectedOutput.trim();
         String s2 = outputResult.toString().trim();