diff --git a/requirements.txt b/requirements.txt
index 9e24baf..065674a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -61,4 +61,3 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.0.6rc1
diff --git a/tests/conftest.py b/tests/conftest.py
index 8b7af11..fbd2bc5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -99,29 +99,25 @@ def images_diff(self, first_image_path: str, second_image_path: str) -> float:
         print(f"{images_diff.GetThresholdedError()=}")
         return images_diff.GetThresholdedError()
 
-    def compare_image(self, nb_messages: int, filename: str) -> bool:
-        for message in range(nb_messages):
-            print(f"{message=}", flush=True)
+    def compare_image(self, filename: str) -> bool:
+        while True:
             image = self.ws.recv()
             if isinstance(image, bytes):
+                response = self.ws.recv()
+                print(f"{response=}", flush=True)
+                result = json.loads(response)["result"]
+                if result["stale"]:
+                    continue
                 test_file_path = os.path.abspath(
-                    os.path.join(self.test_output_dir, "test.jpeg")
+                    os.path.join(self.test_output_dir, f"test.{result["format"]}")
                 )
                 with open(test_file_path, "wb") as f:
                     f.write(image)
                     f.close()
-        if isinstance(image, bytes):
-            response = self.ws.recv()
-            print(f"{response=}", flush=True)
-            format = json.loads(response)["result"]["format"]
-            test_file_path = os.path.abspath(
-                os.path.join(self.test_output_dir, f"test.{format}")
-            )
-            with open(test_file_path, "wb") as f:
-                f.write(image)
-                f.close()
-            path_image = os.path.join(self.images_dir_path, filename)
-            return self.images_diff(test_file_path, path_image) == 0.0
+                path_image = os.path.join(self.images_dir_path, filename)
+                return self.images_diff(test_file_path, path_image) == 0.0
+            else:
+                print("response =", image, flush=True)
         return False
 
     def _init_ws(self) -> None:
@@ -141,10 +137,8 @@ def _drain_initial_messages(
     ) -> None:
         self.ws.settimeout(timeout)
         for i in range(max_messages):
-            print(f"{i=}", flush=True)
             try:
                 response = self.ws.recv()
-                print(f"{response=}", flush=True)
             except WebSocketTimeoutException:
                 print(
                     f"Timeout on message {i}, but continuing to try remaining messages...",
diff --git a/tests/mesh/edges/test_mesh_edges_protocols.py b/tests/mesh/edges/test_mesh_edges_protocols.py
index ae620f3..71796bc 100644
--- a/tests/mesh/edges/test_mesh_edges_protocols.py
+++ b/tests/mesh/edges/test_mesh_edges_protocols.py
@@ -20,7 +20,7 @@ def test_edges_visibility(
         + VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": True}],
     )
-    assert server.compare_image(3, "mesh/edges/visibility.jpeg") == True
+    assert server.compare_image("mesh/edges/visibility.jpeg") == True
 
 
 def test_edges_color(
@@ -33,7 +33,7 @@ def test_edges_color(
         + VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"],
         [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
     )
-    assert server.compare_image(3, "mesh/edges/color.jpeg") == True
+    assert server.compare_image("mesh/edges/color.jpeg") == True
 
 
 def test_edges_with_edged_curve(
@@ -45,18 +45,18 @@ def test_edges_with_edged_curve(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "mesh/edges/register_edged_curve.jpeg") == True
+    assert server.compare_image("mesh/edges/register_edged_curve.jpeg") == True
 
     server.call(
         VtkMeshEdgesView.mesh_edges_prefix
         + VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"],
         [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
     )
-    assert server.compare_image(3, "mesh/edges/edged_curve_color.jpeg") == True
+    assert server.compare_image("mesh/edges/edged_curve_color.jpeg") == True
 
     server.call(
         VtkMeshEdgesView.mesh_edges_prefix
         + VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": False}],
     )
-    assert server.compare_image(3, "mesh/edges/edged_curve_visibility.jpeg") == True
+    assert server.compare_image("mesh/edges/edged_curve_visibility.jpeg") == True
diff --git a/tests/mesh/points/test_mesh_points_protocols.py b/tests/mesh/points/test_mesh_points_protocols.py
index abc3724..1da8cff 100644
--- a/tests/mesh/points/test_mesh_points_protocols.py
+++ b/tests/mesh/points/test_mesh_points_protocols.py
@@ -23,7 +23,7 @@ def test_points_visibility(
         + cast(str, VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"]),
         [{"id": mesh_id, "visibility": True}],
     )
-    assert server.compare_image(3, "mesh/points/visibility.jpeg") == True
+    assert server.compare_image("mesh/points/visibility.jpeg") == True
 
 
 def test_points_size(
@@ -37,7 +37,7 @@ def test_points_size(
         + cast(str, VtkMeshPointsView.mesh_points_schemas_dict["size"]["rpc"]),
         [{"id": mesh_id, "size": 15}],
     )
-    assert server.compare_image(3, "mesh/points/size.jpeg") == True
+    assert server.compare_image("mesh/points/size.jpeg") == True
 
 
 def test_points_color(
@@ -51,7 +51,7 @@ def test_points_color(
         + cast(str, VtkMeshPointsView.mesh_points_schemas_dict["color"]["rpc"]),
         [{"id": mesh_id, "color": {"r": 255, "g": 0, "b": 0}}],
     )
-    assert server.compare_image(3, "mesh/points/color.jpeg") == True
+    assert server.compare_image("mesh/points/color.jpeg") == True
 
 
 def test_points_with_point_set(
@@ -65,25 +65,25 @@ def test_points_with_point_set(
         + cast(str, VtkMeshView.mesh_schemas_dict["register"]["rpc"]),
         [{"id": mesh_id}],
     )
-    assert server.compare_image(3, "mesh/points/register_point_set.jpeg") == True
+    assert server.compare_image("mesh/points/register_point_set.jpeg") == True
 
     server.call(
         VtkMeshPointsView.mesh_points_prefix
         + cast(str, VtkMeshPointsView.mesh_points_schemas_dict["size"]["rpc"]),
         [{"id": mesh_id, "size": 10}],
     )
-    assert server.compare_image(3, "mesh/points/point_set_size.jpeg") == True
+    assert server.compare_image("mesh/points/point_set_size.jpeg") == True
 
     server.call(
         VtkMeshPointsView.mesh_points_prefix
         + cast(str, VtkMeshPointsView.mesh_points_schemas_dict["color"]["rpc"]),
         [{"id": mesh_id, "color": {"r": 255, "g": 0, "b": 0}}],
     )
-    assert server.compare_image(3, "mesh/points/point_set_color.jpeg") == True
+    assert server.compare_image("mesh/points/point_set_color.jpeg") == True
 
     server.call(
         VtkMeshPointsView.mesh_points_prefix
         + cast(str, VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"]),
         [{"id": mesh_id, "visibility": False}],
     )
-    assert server.compare_image(3, "mesh/points/point_set_visibility.jpeg") == True
+    assert server.compare_image("mesh/points/point_set_visibility.jpeg") == True
diff --git a/tests/mesh/polygons/test_mesh_polygons_protocols.py b/tests/mesh/polygons/test_mesh_polygons_protocols.py
index 7f20fa6..9f5ccca 100644
--- a/tests/mesh/polygons/test_mesh_polygons_protocols.py
+++ b/tests/mesh/polygons/test_mesh_polygons_protocols.py
@@ -20,7 +20,7 @@ def test_polygons_color(
         + VtkMeshPolygonsView.mesh_polygons_schemas_dict["color"]["rpc"],
         [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
     )
-    assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
+    assert server.compare_image("mesh/polygons/color.jpeg") == True
 
 
 def test_polygons_visibility(
@@ -34,4 +34,4 @@ def test_polygons_visibility(
         + VtkMeshPolygonsView.mesh_polygons_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": False}],
     )
-    assert server.compare_image(3, "mesh/polygons/visibility.jpeg") == True
+    assert server.compare_image("mesh/polygons/visibility.jpeg") == True
diff --git a/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py b/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py
index 84f9c5b..e17196e 100644
--- a/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py
+++ b/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py
@@ -20,7 +20,7 @@ def test_register_mesh(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "mesh/polyhedra/register.jpeg") == True
+    assert server.compare_image("mesh/polyhedra/register.jpeg") == True
 
 
 def test_polyhedra_color(
@@ -33,7 +33,7 @@ def test_polyhedra_color(
         + VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["color"]["rpc"],
         [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
     )
-    assert server.compare_image(3, "mesh/polyhedra/color.jpeg") == True
+    assert server.compare_image("mesh/polyhedra/color.jpeg") == True
 
 
 def test_polyhedra_visibility(
@@ -46,7 +46,7 @@ def test_polyhedra_visibility(
         + VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": False}],
     )
-    assert server.compare_image(3, "mesh/polyhedra/visibility.jpeg") == True
+    assert server.compare_image("mesh/polyhedra/visibility.jpeg") == True
 
 
 def test_vertex_attribute(
@@ -59,7 +59,7 @@ def test_vertex_attribute(
         + VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["vertex_attribute"]["rpc"],
         [{"id": "123456789", "name": "toto_on_vertices"}],
     )
-    assert server.compare_image(3, "mesh/polyhedra/vertex_attribute.jpeg") == True
+    assert server.compare_image("mesh/polyhedra/vertex_attribute.jpeg") == True
 
 
 def test_polyhedron_attribute(
@@ -74,4 +74,4 @@ def test_polyhedron_attribute(
         ],
         [{"id": "123456789", "name": "toto_on_polyhedra"}],
     )
-    assert server.compare_image(3, "mesh/polyhedra/polyhedron_attribute.jpeg") == True
+    assert server.compare_image("mesh/polyhedra/polyhedron_attribute.jpeg") == True
diff --git a/tests/mesh/test_mesh_protocols.py b/tests/mesh/test_mesh_protocols.py
index dcb1e1b..05919b4 100644
--- a/tests/mesh/test_mesh_protocols.py
+++ b/tests/mesh/test_mesh_protocols.py
@@ -12,7 +12,7 @@ def test_register_mesh(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "mesh/register.jpeg") == True
+    assert server.compare_image("mesh/register.jpeg") == True
 
 
 def test_deregister_mesh(
@@ -25,7 +25,7 @@ def test_deregister_mesh(
         [{"id": "123456789"}],
     )
 
-    assert server.compare_image(3, "mesh/deregister.jpeg") == True
+    assert server.compare_image("mesh/deregister.jpeg") == True
 
 
 def test_opacity(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
@@ -35,7 +35,7 @@ def test_opacity(server: ServerMonitor, dataset_factory: Callable[..., str]) ->
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["opacity"]["rpc"],
         [{"id": "123456789", "opacity": 0.1}],
     )
-    assert server.compare_image(3, "mesh/opacity.jpeg") == True
+    assert server.compare_image("mesh/opacity.jpeg") == True
 
 
 def test_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
@@ -45,7 +45,7 @@ def test_visibility(server: ServerMonitor, dataset_factory: Callable[..., str])
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": False}],
     )
-    assert server.compare_image(3, "mesh/visibility.jpeg") == True
+    assert server.compare_image("mesh/visibility.jpeg") == True
 
 
 def test_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
@@ -55,7 +55,7 @@ def test_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> No
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["color"]["rpc"],
         [{"id": "123456789", "color": {"r": 50, "g": 2, "b": 250}}],
     )
-    assert server.compare_image(3, "mesh/color.jpeg") == True
+    assert server.compare_image("mesh/color.jpeg") == True
 
 
 def test_apply_textures(
@@ -81,32 +81,32 @@ def test_apply_textures(
             }
         ],
     )
-    assert server.compare_image(3, "mesh/apply_textures.jpeg") == True
+    assert server.compare_image("mesh/apply_textures.jpeg") == True
 
 
 # def test_display_vertex_attribute(server):
 #     server.call(VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"], [{"id": "123456789", "file_name": "vertex_attribute.vtp"}])
-#     assert server.compare_image(3, "mesh/display_vertex_attribute_1.jpeg") == True
+#     assert server.compare_image("mesh/display_vertex_attribute_1.jpeg") == True
 
 #     server.call(
 #         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["display_vertex_attribute"]["rpc"],
 #         [{"id": "123456789", "name": "geode_implicit_attribute"}],
 #     )
-#     assert server.compare_image(3, "mesh/display_vertex_attribute_2.jpeg") == True
+#     assert server.compare_image("mesh/display_vertex_attribute_2.jpeg") == True
 
 
 #     server.call(
 #         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["color"]["rpc"],
 #         [{"id": "123456789", "red": 250, "green": 0, "blue": 0}],
 #     )
-#     assert server.compare_image(3, "mesh/display_vertex_attribute_3.jpeg") == True
+#     assert server.compare_image("mesh/display_vertex_attribute_3.jpeg") == True
 
 # def test_display_polygon_attribute(server):
 #     server.call(VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"], [{"id": "123456789", "file_name": "polygon_attribute.vtp"}])
-#     assert server.compare_image(3, "mesh/display_polygon_attribute_1.jpeg") == True
+#     assert server.compare_image("mesh/display_polygon_attribute_1.jpeg") == True
 
 #     server.call(
 #         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["display_polygon_attribute"]["rpc"],
 #         [{"id": "123456789", "name": "implicit_on_polygons"}],
 #     )
-#     assert server.compare_image(3, "mesh/display_polygon_attribute_2.jpeg") == True
+#     assert server.compare_image("mesh/display_polygon_attribute_2.jpeg") == True
diff --git a/tests/model/blocks/test_model_blocks_protocols.py b/tests/model/blocks/test_model_blocks_protocols.py
index a500a54..7dca4b4 100644
--- a/tests/model/blocks/test_model_blocks_protocols.py
+++ b/tests/model/blocks/test_model_blocks_protocols.py
@@ -29,7 +29,7 @@ def test_blocks_polyhedra_visibility(
         ],
     )
 
-    assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
+    assert server.compare_image("model/cube_visibility_false.jpeg") == True
 
     server.call(
         VtkModelBlocksView.model_blocks_prefix
@@ -43,7 +43,7 @@ def test_blocks_polyhedra_visibility(
         ],
     )
 
-    assert server.compare_image(3, "model/blocks/visibility.jpeg") == True
+    assert server.compare_image("model/blocks/visibility.jpeg") == True
 
 
 def test_blocks_polyhedra_color(
@@ -63,4 +63,4 @@ def test_blocks_polyhedra_color(
             }
         ],
     )
-    assert server.compare_image(3, "model/blocks/color.jpeg") == True
+    assert server.compare_image("model/blocks/color.jpeg") == True
diff --git a/tests/model/corners/test_model_corners_protocols.py b/tests/model/corners/test_model_corners_protocols.py
index 702170b..44be5ef 100644
--- a/tests/model/corners/test_model_corners_protocols.py
+++ b/tests/model/corners/test_model_corners_protocols.py
@@ -28,7 +28,7 @@ def test_corners_points_visibility(
             }
         ],
     )
-    assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
+    assert server.compare_image("model/cube_visibility_false.jpeg") == True
 
     server.call(
         VtkModelCornersView.model_corners_prefix
@@ -41,7 +41,7 @@ def test_corners_points_visibility(
             }
         ],
     )
-    assert server.compare_image(3, "model/corners/visibility.jpeg") == True
+    assert server.compare_image("model/corners/visibility.jpeg") == True
 
 
 def test_corners_points_color(
@@ -61,4 +61,4 @@ def test_corners_points_color(
             }
         ],
     )
-    assert server.compare_image(3, "model/corners/color.jpeg") == True
+    assert server.compare_image("model/corners/color.jpeg") == True
diff --git a/tests/model/edges/test_model_edges_protocols.py b/tests/model/edges/test_model_edges_protocols.py
index 8c44b09..f10dbc4 100644
--- a/tests/model/edges/test_model_edges_protocols.py
+++ b/tests/model/edges/test_model_edges_protocols.py
@@ -22,4 +22,4 @@ def test_edges_visibility(
         + VtkModelEdgesView.model_edges_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": True}],
     )
-    assert server.compare_image(3, "model/edges/visibility.jpeg") == True
+    assert server.compare_image("model/edges/visibility.jpeg") == True
diff --git a/tests/model/lines/test_model_lines_protocols.py b/tests/model/lines/test_model_lines_protocols.py
index 4f197fe..b063745 100644
--- a/tests/model/lines/test_model_lines_protocols.py
+++ b/tests/model/lines/test_model_lines_protocols.py
@@ -28,7 +28,7 @@ def test_lines_edges_visibility(
             }
         ],
     )
-    assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
+    assert server.compare_image("model/cube_visibility_false.jpeg") == True
 
     server.call(
         VtkModelLinesView.model_lines_prefix
@@ -41,7 +41,7 @@ def test_lines_edges_visibility(
             }
         ],
     )
-    assert server.compare_image(3, "model/lines/visibility.jpeg") == True
+    assert server.compare_image("model/lines/visibility.jpeg") == True
 
 
 def test_lines_edges_color(
@@ -61,4 +61,4 @@ def test_lines_edges_color(
             }
         ],
     )
-    assert server.compare_image(3, "model/lines/color.jpeg") == True
+    assert server.compare_image("model/lines/color.jpeg") == True
diff --git a/tests/model/points/test_model_points_protocols.py b/tests/model/points/test_model_points_protocols.py
index d794ef1..95b7eac 100644
--- a/tests/model/points/test_model_points_protocols.py
+++ b/tests/model/points/test_model_points_protocols.py
@@ -22,7 +22,7 @@ def test_points_visibility(
         + VtkModelPointsView.model_points_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": True}],
     )
-    assert server.compare_image(3, "model/points/visibility.jpeg") == True
+    assert server.compare_image("model/points/visibility.jpeg") == True
 
 
 def test_points_size(
@@ -36,4 +36,4 @@ def test_points_size(
         + VtkModelPointsView.model_points_schemas_dict["size"]["rpc"],
         [{"id": "123456789", "size": 20}],
     )
-    assert server.compare_image(3, "model/points/size.jpeg") == True
+    assert server.compare_image("model/points/size.jpeg") == True
diff --git a/tests/model/surfaces/test_model_surfaces_protocols.py b/tests/model/surfaces/test_model_surfaces_protocols.py
index 298464f..02bc5d4 100644
--- a/tests/model/surfaces/test_model_surfaces_protocols.py
+++ b/tests/model/surfaces/test_model_surfaces_protocols.py
@@ -28,7 +28,7 @@ def test_surfaces_polygons_visibility(
             }
         ],
     )
-    assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
+    assert server.compare_image("model/cube_visibility_false.jpeg") == True
 
     server.call(
         VtkModelSurfacesView.model_surfaces_prefix
@@ -42,7 +42,7 @@ def test_surfaces_polygons_visibility(
         ],
     )
 
-    assert server.compare_image(3, "model/surfaces/visibility.jpeg") == True
+    assert server.compare_image("model/surfaces/visibility.jpeg") == True
 
 
 def test_surfaces_polygons_color(
@@ -62,4 +62,4 @@ def test_surfaces_polygons_color(
             }
         ],
     )
-    assert server.compare_image(3, "model/surfaces/color.jpeg") == True
+    assert server.compare_image("model/surfaces/color.jpeg") == True
diff --git a/tests/model/test_model_protocols.py b/tests/model/test_model_protocols.py
index bd65a7a..1348318 100644
--- a/tests/model/test_model_protocols.py
+++ b/tests/model/test_model_protocols.py
@@ -12,7 +12,7 @@ def test_register_model(
         VtkModelView.model_prefix + VtkModelView.model_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "model/register.jpeg") == True
+    assert server.compare_image("model/register.jpeg") == True
 
 
 def test_register_model_cube(
@@ -24,7 +24,7 @@ def test_register_model_cube(
         VtkModelView.model_prefix + VtkModelView.model_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "model/cube_register.jpeg") == True
+    assert server.compare_image("model/cube_register.jpeg") == True
 
 
 def test_visibility_model(
@@ -38,7 +38,7 @@ def test_visibility_model(
         + VtkModelView.model_schemas_dict["visibility"]["rpc"],
         [{"id": "123456789", "visibility": False}],
     )
-    assert server.compare_image(3, "model/visibility.jpeg") == True
+    assert server.compare_image("model/visibility.jpeg") == True
 
 
 def test_deregister_model(
@@ -52,4 +52,4 @@ def test_deregister_model(
         + VtkModelView.model_schemas_dict["deregister"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "model/deregister.jpeg") == True
+    assert server.compare_image("model/deregister.jpeg") == True
diff --git a/tests/test_generic_protocols.py b/tests/test_generic_protocols.py
index a2af1e5..ef76642 100644
--- a/tests/test_generic_protocols.py
+++ b/tests/test_generic_protocols.py
@@ -14,7 +14,7 @@ def test_register_mesh(
         + VtkGenericView.generic_schemas_dict["register"]["rpc"],
         [{"id": data_id}],
     )
-    assert server.compare_image(3, "mesh/register.jpeg") is True
+    assert server.compare_image("mesh/register.jpeg") is True
 
 
 def test_register_model(
@@ -28,7 +28,7 @@ def test_register_model(
         + VtkGenericView.generic_schemas_dict["register"]["rpc"],
         [{"id": data_id}],
     )
-    assert server.compare_image(3, "model/register.jpeg") is True
+    assert server.compare_image("model/register.jpeg") is True
 
 
 def test_deregister_mesh(
@@ -41,7 +41,7 @@ def test_deregister_mesh(
         + VtkGenericView.generic_schemas_dict["deregister"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "mesh/deregister.jpeg") == True
+    assert server.compare_image("mesh/deregister.jpeg") == True
 
 
 def test_deregister_model(
@@ -54,4 +54,4 @@ def test_deregister_model(
         + VtkGenericView.generic_schemas_dict["deregister"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "model/deregister.jpeg") == True
+    assert server.compare_image("model/deregister.jpeg") == True
diff --git a/tests/test_viewer_protocols.py b/tests/test_viewer_protocols.py
index 59a87e8..2cc956c 100644
--- a/tests/test_viewer_protocols.py
+++ b/tests/test_viewer_protocols.py
@@ -18,7 +18,7 @@ def test_reset_visualization(server: ServerMonitor) -> None:
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["reset_visualization"]["rpc"]
     )
-    assert server.compare_image(3, "viewer/reset_visualization.jpeg") == True
+    assert server.compare_image("viewer/reset_visualization.jpeg") == True
 
 
 def test_reset_camera(server: ServerMonitor) -> None:
@@ -26,7 +26,7 @@ def test_reset_camera(server: ServerMonitor) -> None:
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["reset_camera"]["rpc"]
     )
-    assert server.compare_image(3, "viewer/reset_camera.jpeg") == True
+    assert server.compare_image("viewer/reset_camera.jpeg") == True
 
 
 def test_set_viewer_background_color(server: ServerMonitor) -> None:
@@ -35,7 +35,7 @@ def test_set_viewer_background_color(server: ServerMonitor) -> None:
         + VtkViewerView.viewer_schemas_dict["set_background_color"]["rpc"],
         [{"color": {"r": 0, "g": 0, "b": 255}}],
     )
-    assert server.compare_image(3, "viewer/set_background_color.jpeg") == True
+    assert server.compare_image("viewer/set_background_color.jpeg") == True
 
 
 def test_get_point_position(
@@ -198,19 +198,19 @@ def test_grid_scale(server: ServerMonitor, dataset_factory: Callable[..., str])
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["reset_visualization"]["rpc"],
     )
-    assert server.compare_image(3, "viewer/reset_visualization.jpeg") == True
+    assert server.compare_image("viewer/reset_visualization.jpeg") == True
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": data_id}],
     )
-    assert server.compare_image(3, "viewer/register_hat.jpeg") == True
+    assert server.compare_image("viewer/register_hat.jpeg") == True
 
     server.call(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["grid_scale"]["rpc"],
         [{"visibility": True}],
     )
-    assert server.compare_image(3, "viewer/grid_scale_on.jpeg") == True
+    assert server.compare_image("viewer/grid_scale_on.jpeg") == True
 
 
 def test_axes(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
@@ -222,7 +222,7 @@ def test_axes(server: ServerMonitor, dataset_factory: Callable[..., str]) -> Non
         [{"visibility": False}],
     )
 
-    assert server.compare_image(3, "viewer/axes_off.jpeg") == True
+    assert server.compare_image("viewer/axes_off.jpeg") == True
 
 
 def test_update_camera(
@@ -247,7 +247,7 @@ def test_update_camera(
             }
         ],
     )
-    assert server.compare_image(3, "viewer/update_camera.jpeg") == True
+    assert server.compare_image("viewer/update_camera.jpeg") == True
 
 
 def test_render_now(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
@@ -270,14 +270,14 @@ def test_render_now(server: ServerMonitor, dataset_factory: Callable[..., str])
             }
         ],
     )
-    server.compare_image(1, "mesh/register.jpeg")
+    server.compare_image("mesh/register.jpeg")
 
     server.call(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["render_now"]["rpc"],
     )
 
-    assert server.compare_image(3, "viewer/render_now.jpeg") == True
+    assert server.compare_image("viewer/render_now.jpeg") == True
 
 
 def test_set_z_scaling(
@@ -289,14 +289,14 @@ def test_set_z_scaling(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "viewer/polygon_attribute.jpeg") == True
+    assert server.compare_image("viewer/polygon_attribute.jpeg") == True
 
     dataset_factory(id="987654321", viewable_file_name="vertex_attribute.vtp")
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "987654321"}],
     )
-    assert server.compare_image(3, "viewer/vertex_and_polygon_attribute.jpeg") == True
+    assert server.compare_image("viewer/vertex_and_polygon_attribute.jpeg") == True
 
     camera_options = {
         "focal_point": [6.05, 5.7, 1.5],
@@ -315,14 +315,14 @@ def test_set_z_scaling(
             }
         ],
     )
-    server.compare_image(3, "mesh/register.jpeg")
+    server.compare_image("mesh/register.jpeg")
 
     server.call(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["set_z_scaling"]["rpc"],
         [{"z_scale": 2.5}],
     )
-    assert server.compare_image(3, "viewer/set_z_scaling.jpeg") == True
+    assert server.compare_image("viewer/set_z_scaling.jpeg") == True
 
 
 def test_combined_scaling_and_grid(
@@ -332,22 +332,22 @@ def test_combined_scaling_and_grid(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["reset_visualization"]["rpc"],
     )
-    assert server.compare_image(3, "viewer/reset_visualization.jpeg") == True
+    assert server.compare_image("viewer/reset_visualization.jpeg") == True
     dataset_factory(id="123456789", viewable_file_name="hat.vtp")
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
-    assert server.compare_image(3, "viewer/register_hat.jpeg") == True
+    assert server.compare_image("viewer/register_hat.jpeg") == True
     server.call(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["grid_scale"]["rpc"],
         [{"visibility": True}],
     )
-    assert server.compare_image(3, "viewer/grid_scale_on.jpeg") == True
+    assert server.compare_image("viewer/grid_scale_on.jpeg") == True
     server.call(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["set_z_scaling"]["rpc"],
         [{"z_scale": 2.5}],
     )
-    assert server.compare_image(3, "viewer/combined_scaling_and_grid.jpeg") == True
+    assert server.compare_image("viewer/combined_scaling_and_grid.jpeg") == True