diff --git a/source/Willow-Core-Tests/CheckboxWebViewTest.class.st b/source/Willow-Core-Tests/CheckboxWebViewTest.class.st
index ff982636..d5dc1227 100644
--- a/source/Willow-Core-Tests/CheckboxWebViewTest.class.st
+++ b/source/Willow-Core-Tests/CheckboxWebViewTest.class.st
@@ -41,7 +41,7 @@ CheckboxWebViewTest >> testIdentifierOn [
 
 	self
 		assert: html
-		equals: '<input checked name="2" id="checkbox-id1" type="checkbox"/><input name="3" type="hidden"/>'
+		equals: '<input checked name="2" id="checkbox-id1" type="checkbox"/><input name="4" type="hidden"/>'
 ]
 
 { #category : #'tests-configuring' }
diff --git a/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st b/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
index 7c93d62b..9ae9ca6d 100644
--- a/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
+++ b/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
@@ -727,7 +727,7 @@ CombinedWebInteractionInterpreterTest >> testShowWhileCallingServerToRender [
 	self
 		assert: html
 		equals:
-			'<button id="button-id3" type="button">Ok</button><button id="button-id5" type="button">Cancel</button><div id="container-id1"></div><script type="text/javascript">$("#button-id3").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"url":"/","data":"2"})});$("#button-id5").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"url":"/","data":"4"})});</script>'
+			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><div id="container-id1"></div><script type="text/javascript">$("#button-id3").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"url":"/","data":"2"})});$("#button-id6").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"url":"/","data":"5"})});</script>'
 ]
 
 { #category : #'tests - Configuring - Serialization' }
@@ -869,7 +869,7 @@ CombinedWebInteractionInterpreterTest >> testToggleCssClassOn [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id3" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#container-id1").toggleClass("willow")});$("#button-id3").click(function(event){$("#container-id1").toggleClass("willow")});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#container-id1").toggleClass("willow")});$("#button-id4").click(function(event){$("#container-id1").toggleClass("willow")});</script>'
 ]
 
 { #category : #'tests - Configuring - CSS' }
@@ -918,7 +918,7 @@ CombinedWebInteractionInterpreterTest >> testTransformInto [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id3" type="button">Cancel</button><div id="container-id1"></div><script type="text/javascript">$("#button-id2").click(function(event){$("#container-id1").html("Loading...")});$("#button-id3").click(function(event){$("#container-id1").html("Loading...")});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><div id="container-id1"></div><script type="text/javascript">$("#button-id2").click(function(event){$("#container-id1").html("Loading...")});$("#button-id4").click(function(event){$("#container-id1").html("Loading...")});</script>'
 ]
 
 { #category : #'tests - Configuring - CSS' }
diff --git a/source/Willow-Core-Tests/MultipleSelectionListBoxWebViewTest.class.st b/source/Willow-Core-Tests/MultipleSelectionListBoxWebViewTest.class.st
index 2c6dfad5..b2d4b7f1 100644
--- a/source/Willow-Core-Tests/MultipleSelectionListBoxWebViewTest.class.st
+++ b/source/Willow-Core-Tests/MultipleSelectionListBoxWebViewTest.class.st
@@ -148,7 +148,7 @@ MultipleSelectionListBoxWebViewTest >> testIdentifierOn [
 
 	self
 		assert: html
-		equals: '<select name="2" id="list-box-id1" multiple></select><input name="3" type="hidden"/>'
+		equals: '<select name="2" id="list-box-id1" multiple></select><input name="4" type="hidden"/>'
 ]
 
 { #category : #'tests-Multiple Selection-API' }
diff --git a/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st b/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
index d5dd06ef..b3b3f5f3 100644
--- a/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
+++ b/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
@@ -92,5 +92,5 @@ PeriodicallyRenderedWebViewTest >> testScriptToRefreshAndRenderContentOn [
 	self
 		assert: html
 		equals:
-			'<div id="id2"></div><script type="text/javascript">$("#id2").html("Count:  2<br/><script type=\"text/javascript\">$.ajax({\"url\":\"/\",\"data\":\"1\"});</script>");</script>'
+			'<div id="id3"></div><script type="text/javascript">$("#id3").html("Count:  2<br/><script type=\"text/javascript\">$.ajax({\"url\":\"/\",\"data\":\"2\"});</script>");</script>'
 ]
diff --git a/source/Willow-Core-Tests/RenderingCommandTest.class.st b/source/Willow-Core-Tests/RenderingCommandTest.class.st
index 53c1fbdd..17dda7ba 100644
--- a/source/Willow-Core-Tests/RenderingCommandTest.class.st
+++ b/source/Willow-Core-Tests/RenderingCommandTest.class.st
@@ -40,7 +40,7 @@ RenderingCommandTest >> testModelLoadingInstructions [
 	self
 		assert: html
 		equals:
-			'<a id="id2"></a><script type="text/javascript">$("#id2").click(function(){$("#container-id1").html("<span>Test</span>")});</script>'
+			'<a id="id3"></a><script type="text/javascript">$("#id3").click(function(){$("#container-id1").html("<span>Test</span>")});</script>'
 ]
 
 { #category : #'tests-accessing' }