diff --git a/docker/Dockerfile.arouterTest b/docker/Dockerfile.arouterTest
index ef743a5..5fbfc12 100644
--- a/docker/Dockerfile.arouterTest
+++ b/docker/Dockerfile.arouterTest
@@ -34,9 +34,11 @@
 WORKDIR /app
 
 # Copy required files
-COPY --from=build-env /build/afrouter /app/
-COPY --from=build-env /build/afrouterTest /app/
+COPY --from=build-env /build/afrouter /app/tests/
+COPY --from=build-env /build/afrouterTest /app/tests/
 COPY --from=build-env /build/tests/suites/arouter.json /app/
-COPY --from=build-env /build/tests/suites/voltha.pb /app
+COPY --from=build-env /build/tests/suites/voltha.pb /app/tests/
 COPY --from=build-env /build/tests /app/tests/
+COPY --from=build-env /src/tests /app/tests/
 
+CMD tests/runAll tests
diff --git a/tests/afrouter/suites/test1/test1.json b/tests/afrouter/suites/test1/test1.json
index 38f2903..ad0d579 100644
--- a/tests/afrouter/suites/test1/test1.json
+++ b/tests/afrouter/suites/test1/test1.json
@@ -201,7 +201,7 @@
 				"method":"GetGoroutineCount",
 				"param":"{}",
 				"meta": [ ],
-				"expect":"{Count:39}",
+				"expect":"{Count:45}",
 				"expectMeta": [ ]
 			},
 			"servers": [ ]
diff --git a/tests/afrouter/suites/test2/test2.tmpl.json b/tests/afrouter/suites/test2/test2.tmpl.json
index 8d8c6b1..6efa146 100644
--- a/tests/afrouter/suites/test2/test2.tmpl.json
+++ b/tests/afrouter/suites/test2/test2.tmpl.json
@@ -217,7 +217,7 @@
 				"method":"GetGoroutineCount",
 				"param":"{}",
 				"meta": [ ],
-				"expect":"{Count:39}",
+				"expect":"{Count:45}",
 				"expectMeta": [ ]
 			},
 			"servers": [ ]
diff --git a/tests/afrouter/suites/test3/test3.tmpl.json b/tests/afrouter/suites/test3/test3.tmpl.json
index 9bcaef9..a3c5456 100644
--- a/tests/afrouter/suites/test3/test3.tmpl.json
+++ b/tests/afrouter/suites/test3/test3.tmpl.json
@@ -230,7 +230,7 @@
 				"method":"GetGoroutineCount",
 				"param":"{}",
 				"meta": [ ],
-				"expect":"{Count:39}",
+				"expect":"{Count:45}",
 				"expectMeta": [ ]
 			},
 			"servers": [ ]