diff --git a/tests/api/deckies/test_service_config_api.py b/tests/api/deckies/test_service_config_api.py
index 1a9915c2..40037845 100644
--- a/tests/api/deckies/test_service_config_api.py
+++ b/tests/api/deckies/test_service_config_api.py
@@ -35,7 +35,7 @@ async def test_get_ssh_schema_returns_declared_fields(
     assert body["name"] == "ssh"
     assert body["ports"] == [22]
     keys = {f["key"] for f in body["fields"]}
-    assert keys == {"password", "hostname"}
+    assert keys == {"password", "user", "user_password", "hostname"}
     pw = next(f for f in body["fields"] if f["key"] == "password")
     assert pw["type"] == "password" and pw["secret"] is True
 
diff --git a/tests/api/topology/test_models.py b/tests/api/topology/test_models.py
index 91cb7e6f..82914907 100644
--- a/tests/api/topology/test_models.py
+++ b/tests/api/topology/test_models.py
@@ -80,8 +80,7 @@ def test_mutation_request_rejects_unknown_op():
 async def test_summary_accepts_repo_topology_row(repo):
     plan = generate(_cfg())
     tid = await persist(repo, plan)
-    row = await repo.get_topology(tid)
-    summary = TopologySummary(**row)
+    summary = await repo.get_topology(tid)
     assert summary.id == tid
     assert summary.version == 1
     # Defaults surface cleanly on a fresh topology.
@@ -97,8 +96,7 @@ async def test_summary_surfaces_needs_resync_flag(repo):
     plan = generate(_cfg())
     tid = await persist(repo, plan)
     await repo.set_topology_resync(tid, True)
-    row = await repo.get_topology(tid)
-    summary = TopologySummary(**row)
+    summary = await repo.get_topology(tid)
     assert summary.needs_resync is True
 
 
diff --git a/tests/api/topology/test_personas_api.py b/tests/api/topology/test_personas_api.py
index 5bbaaf96..dafa5894 100644
--- a/tests/api/topology/test_personas_api.py
+++ b/tests/api/topology/test_personas_api.py
@@ -88,8 +88,8 @@ async def test_put_then_get(client, auth_token):
 
     # Persisted as JSON string in the topology row.
     topo = await _repo.get_topology(tid)
-    assert isinstance(topo["email_personas"], str)
-    stored = json.loads(topo["email_personas"])
+    assert isinstance(topo.email_personas, str)
+    stored = json.loads(topo.email_personas)
     assert {p["email"] for p in stored} == {"a@example.com", "b@example.com"}
 
 
diff --git a/tests/live/test_health_live.py b/tests/live/test_health_live.py
index 275a352c..1afe1d25 100644
--- a/tests/live/test_health_live.py
+++ b/tests/live/test_health_live.py
@@ -119,7 +119,7 @@ class TestHealthLive:
         )
         data = resp.json()
         expected = {"database", "ingestion_worker", "collector_worker",
-                    "attacker_worker", "sniffer_worker", "docker"}
+                    "attacker_worker", "sniffer_worker", "tarpit_watcher", "docker"}
         assert set(data["components"].keys()) == expected
 
     async def test_database_healthy_with_real_db(self, live_client, token):