diff --git a/Libraries/PyKotor/tests/test_area_layout.py b/Libraries/PyKotor/tests/test_area_layout.py
index b1c467074..77dd2d285 100644
--- a/Libraries/PyKotor/tests/test_area_layout.py
+++ b/Libraries/PyKotor/tests/test_area_layout.py
@@ -18,16 +18,26 @@
 
 def _layout_test_kit() -> TileKit:
     kit = TileKit(name="Layout Kit", kit_id="layout")
-    kit.floors.append(TileTemplate(TileTemplateKind.FLOOR, "floor_a", "floor_a", name="Floor A", model="floor_a"))
+    kit.floors.append(
+        TileTemplate(TileTemplateKind.FLOOR, "floor_a", "floor_a", name="Floor A", model="floor_a")
+    )
     kit.ceilings.append(
-        TileTemplate(TileTemplateKind.CEILING, "ceiling_a", "ceiling_a", name="Ceiling A", model="ceiling_a")
+        TileTemplate(
+            TileTemplateKind.CEILING, "ceiling_a", "ceiling_a", name="Ceiling A", model="ceiling_a"
+        )
+    )
+    kit.walls.append(
+        TileTemplate(TileTemplateKind.WALL, "wall_a", "wall_a", name="Wall A", model="wall_a")
     )
-    kit.walls.append(TileTemplate(TileTemplateKind.WALL, "wall_a", "wall_a", name="Wall A", model="wall_a"))
     kit.inner_corners.append(
-        TileTemplate(TileTemplateKind.INNER_CORNER, "inner_a", "inner_a", name="Inner A", model="inner_a")
+        TileTemplate(
+            TileTemplateKind.INNER_CORNER, "inner_a", "inner_a", name="Inner A", model="inner_a"
+        )
     )
     kit.outer_corners.append(
-        TileTemplate(TileTemplateKind.OUTER_CORNER, "outer_a", "outer_a", name="Outer A", model="outer_a")
+        TileTemplate(
+            TileTemplateKind.OUTER_CORNER, "outer_a", "outer_a", name="Outer A", model="outer_a"
+        )
     )
     kit.tiles.append(
         TileCellTemplate(
@@ -40,13 +50,22 @@ def _layout_test_kit() -> TileKit:
                 WallHookTemplate("wall_a", Vector3(-5.0, 0.0, 0.0), QuaternionWXYZ()),
             ],
             inner_corner_hooks=[
-                CornerHookTemplate("inner_a", Vector3(5.0, 5.0, 0.0), QuaternionWXYZ(), adjacent=[0, 1])
+                CornerHookTemplate(
+                    "inner_a", Vector3(5.0, 5.0, 0.0), QuaternionWXYZ(), adjacent=[0, 1]
+                )
             ],
             outer_corner_hooks=[
-                CornerHookTemplate("outer_a", Vector3(-5.0, -5.0, 0.0), QuaternionWXYZ(), adjacent=[0, 1])
+                CornerHookTemplate(
+                    "outer_a", Vector3(-5.0, -5.0, 0.0), QuaternionWXYZ(), adjacent=[0, 1]
+                )
             ],
         )
     )
+    kit.objects.append(
+        TileTemplate(
+            TileTemplateKind.OBJECT, "crate_a", "crate_a", name="Crate A", model="crate_a"
+        ),
+    )
     return kit
 
 
@@ -111,3 +130,72 @@ def test_area_layout_roundtrip_dict_preserves_tiles_and_wall_overrides():
     assert len(restored.rooms[0].tiles) == 2
     assert restored.rooms[0].tiles[1].local_position.x == pytest.approx(10.0)
     assert restored.rooms[0].tiles[0].walls[0].linked_tile is restored.rooms[0].tiles[1]
+
+
+def _kit_with_tile_b_wall_mismatch() -> TileKit:
+    """Second tile only exposes ``wall_b`` hooks; extending from a ``wall_a`` edge must fail loudly."""
+    kit = _layout_test_kit()
+    kit.walls.append(
+        TileTemplate(TileTemplateKind.WALL, "wall_b", "wall_b", name="Wall B", model="wall_b")
+    )
+    kit.tiles.append(
+        TileCellTemplate(
+            template_id="tile_b",
+            name="Tile B",
+            default_floor_id="floor_a",
+            default_ceiling_id="ceiling_a",
+            wall_hooks=[WallHookTemplate("wall_b", Vector3(5.0, 0.0, 0.0), QuaternionWXYZ())],
+        )
+    )
+    return kit
+
+
+def test_area_layout_extend_tile_from_wall_raises_when_no_hook_matches_wall_type():
+    kit = _kit_with_tile_b_wall_mismatch()
+    layout = AreaLayout()
+    room = layout.add_room_from_tile(kit, "tile_a")
+    wall_a = room.tiles[0].walls[0]
+
+    with pytest.raises(ValueError, match="has no wall hook for wall_a"):
+        room.extend_tile_from_wall(kit, room.tiles[0], wall_a, "tile_b")
+
+
+def test_area_layout_from_dict_missing_kit_raises():
+    kit = _layout_test_kit()
+    layout = AreaLayout()
+    layout.add_room_from_tile(kit, "tile_a")
+    data = area_layout_to_dict(layout)
+    data["rooms"][0]["tiles"][0]["kitID"] = "no_such_kit"
+
+    with pytest.raises(ValueError, match="Missing kit no_such_kit"):
+        area_layout_from_dict(data, {"layout": kit})
+
+
+def test_area_layout_from_dict_invalid_floor_override_raises():
+    kit = _layout_test_kit()
+    layout = AreaLayout()
+    layout.add_room_from_tile(kit, "tile_a")
+    data = area_layout_to_dict(layout)
+    data["rooms"][0]["tiles"][0]["floor"]["templateID"] = "not_a_floor_template"
+
+    with pytest.raises(ValueError, match="Missing floor template not_a_floor_template"):
+        area_layout_from_dict(data, {"layout": kit})
+
+
+def test_area_layout_objects_roundtrip_dict():
+    kit = _layout_test_kit()
+    layout = AreaLayout()
+    room = layout.add_room_from_tile(kit, "tile_a")
+    room.add_object(kit, "crate_a", position=Vector3(1.0, 2.0, 3.0))
+
+    data = area_layout_to_dict(layout)
+    restored = area_layout_from_dict(data, {"layout": kit})
+
+    assert len(restored.rooms) == 1
+    assert len(restored.rooms[0].objects) == 1
+    obj = restored.rooms[0].objects[0]
+    assert obj.template_id == "crate_a"
+    assert obj.kit_id == "layout"
+    assert obj.local_position.x == pytest.approx(1.0)
+    assert obj.local_position.y == pytest.approx(2.0)
+    assert obj.local_position.z == pytest.approx(3.0)