diff --git a/unittests/test_identifiable_adapters.py b/unittests/test_identifiable_adapters.py
index 6eedbcd15e9ccbec88fa0f6d1bde4449fbdabe2a..ee5374a9702b2274625b54924f1a15298a56d162 100644
--- a/unittests/test_identifiable_adapters.py
+++ b/unittests/test_identifiable_adapters.py
@@ -161,16 +161,16 @@ def test_get_identifiable():
 
     ident = CaosDBIdentifiableAdapter()
     ident.load_from_yaml_definition(UNITTESTDIR / "example_identifiables.yml")
-    r_cur = SemanticEntity(db.Record(id=5)
-                           .add_parent(name="Experiment", id=3)
-                           .add_property(name="date", value="2022-02-01")
-                           .add_property(name="result", value="FAIL"),
-                           None
-                           )
-    id_r0 = ident.get_identifiable(r_cur, [])
+    rec = (db.Record(id=5)
+           .add_parent(name="Experiment", id=3)
+           .add_property(name="date", value="2022-02-01")
+           .add_property(name="result", value="FAIL"))
+    se = SemanticEntity(rec,
+                        ident.get_registered_identifiable(rec))
+    id_r0 = ident.get_identifiable(se, [])
+    r_cur = se.fragments[0]
     assert r_cur.parents[0].name == id_r0.record_type
-    assert r_cur.get_property(
-        "date").value == id_r0.properties["date"]
+    assert r_cur.get_property("date").value == id_r0.properties["date"]
     assert len(r_cur.parents) == 1
     assert len(r_cur.properties) == 2
     assert len(id_r0.properties) == 1
diff --git a/unittests/test_semantic_target.py b/unittests/test_semantic_target.py
index 300851f293c934079f3568155a767e7d1fda4557..7c5b8a817012c7c7c5afeeebea169ad37234191c 100644
--- a/unittests/test_semantic_target.py
+++ b/unittests/test_semantic_target.py
@@ -28,7 +28,7 @@ def test_create_flat_list():
     b = db.Record()
     a.add_property(name="a", value=a)
     a.add_property(name="b", value=b)
-    flat = SemanticTarget.create_flat_list([a])
+    flat = SemanticTarget._create_flat_list([a])
     assert len(flat) == 2
     assert a in flat
     assert b in flat
@@ -36,7 +36,7 @@ def test_create_flat_list():
     c.add_property(name="a", value=a)
     # This would caus recursion if it is not dealt with properly.
     a.add_property(name="c", value=c)
-    flat = SemanticTarget.create_flat_list([c])
+    flat = SemanticTarget._create_flat_list([c])
     assert len(flat) == 3
     assert a in flat
     assert b in flat
@@ -51,7 +51,7 @@ def test_create_reference_mapping():
 
     (forward_references, backward_references, forward_id_references,
      backward_id_references, forward_id_referenced_by,
-     backward_id_referenced_by) = SemanticTarget.new_create_reference_mapping(
+     backward_id_referenced_by) = SemanticTarget._create_reference_mapping(
         ses,
         {id(a): ses[0], id(b): ses[1]}
     )