diff --git a/tests/conftest.py b/tests/conftest.py
index 0cd1493..dceac72 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -149,7 +149,7 @@ def volume_folders(tmpdir, mocker):
 
 
 @pytest.fixture()
-def raw_dummy_service(tmpdir):
+def raw_dummy_service(tmpdir) -> DummyService:
     dirnames = ["test_service", "also_test_service"]
     service_dirs = []
     for d in dirnames:
diff --git a/tests/test_graphql/test_services.py b/tests/test_graphql/test_services.py
index 6d841d6..06ef3a1 100644
--- a/tests/test_graphql/test_services.py
+++ b/tests/test_graphql/test_services.py
@@ -105,17 +105,6 @@ def mock_check_volume(mocker):
     return mock
 
 
-# TODO: remove
-@pytest.fixture()
-def mock_check_service_mover_binds(mocker):
-    mock = mocker.patch(
-        "selfprivacy_api.services.service.check_binds",
-        autospec=True,
-        return_value=None,
-    )
-    return mock
-
-
 API_START_MUTATION = """
 mutation TestStartService($service_id: String!) {
     services {
@@ -631,8 +620,6 @@ def test_graphql_move_service_without_folders_on_old_volume(
 def test_graphql_move_service(
     authorized_client,
     generic_userdata,
-    # TODO: substitute with a weaker mock or delete altogether
-    mock_check_service_mover_binds,
     mock_check_volume,
     dummy_service_with_binds,
 ):
diff --git a/tests/test_services.py b/tests/test_services.py
index 98cfa4e..de828d8 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -80,21 +80,6 @@ def test_paths_from_owned_paths():
     ]
 
 
-# def test_foldermoves_from_ownedpaths():
-#     owned = OwnedPath(
-#         path="var/lib/bitwarden",
-#         group="vaultwarden",
-#         owner="vaultwarden",
-#     )
-
-#     assert FolderMoveNames.from_owned_path(owned) == FolderMoveNames(
-#         name="bitwarden",
-#         bind_location="var/lib/bitwarden",
-#         group="vaultwarden",
-#         owner="vaultwarden",
-#     )
-
-
 def test_enabling_disabling_reads_json(dummy_service: DummyService):
     with WriteUserData() as data:
         data["modules"][dummy_service.get_id()]["enable"] = False