diff --git a/src/bonsai/test/bim/feature/geometry.feature b/src/bonsai/test/bim/feature/geometry.feature
index 0f091fd9ca..353f61132c 100644
--- a/src/bonsai/test/bim/feature/geometry.feature
+++ b/src/bonsai/test/bim/feature/geometry.feature
@@ -292,14 +292,31 @@ Scenario: Override duplicate move - with active IFC data
     And I set the "Class" property to "IfcWall"
     And I click "Assign IFC Class"
     And the object "IfcWall/Cube" is selected
-    And additionally the object "IfcBuildingStorey/My Storey" is selected
-    And I set "scene.BIMSpatialDecompositionProperties.is_locked" to "False"
     When I duplicate the selected objects
     Then the object "IfcWall/Cube" exists
     And the object "IfcWall/Cube" is an "IfcWall"
     And the object "IfcWall/Cube.001" exists
     And the object "IfcWall/Cube.001" is an "IfcWall"
     And the object "IfcWall/Cube.001" has a "Tessellation" representation of "Model/Body/MODEL_VIEW"
+
+Scenario: Override duplicate move - with locked elements
+    Given an empty IFC project
+    And I add a cube
+    And the object "Cube" is selected
+    And I look at the "Class" panel
+    And I set the "Products" property to "IfcElement"
+    And I set the "Class" property to "IfcWall"
+    And I click "Assign IFC Class"
+    And the object "IfcWall/Cube" is selected
+    And I look at the "Spatial Decomposition" panel
+    And I set the "is_visible" property to "TRUE"
+    And additionally the object "IfcBuildingStorey/My Storey" is selected
+    Then I press "bim.override_object_duplicate_move" and expect error "Error: 'IfcBuildingStorey/My Storey' is locked. Unlock it via the Spatial panel in the Project Overview tab."
+    And the object "IfcWall/Cube" exists
+    And the object "IfcWall/Cube" is an "IfcWall"
+    And the object "IfcWall/Cube.001" exists
+    And the object "IfcWall/Cube.001" is an "IfcWall"
+    And the object "IfcWall/Cube.001" has a "Tessellation" representation of "Model/Body/MODEL_VIEW"
     And the object "IfcBuildingStorey/My Storey.001" does not exist
 
 Scenario: Override duplicate move - with unlocked elements
@@ -310,8 +327,10 @@ Scenario: Override duplicate move - with unlocked elements
     And I set the "Products" property to "IfcElement"
     And I set the "Class" property to "IfcWall"
     And I click "Assign IFC Class"
+    And I look at the "Spatial Decomposition" panel
+    And I set the "is_visible" property to "TRUE"
+    And I set the "is_locked" property to "FALSE"
     And the object "IfcBuildingStorey/My Storey" is selected
-    And I set "scene.BIMSpatialDecompositionProperties.is_locked" to "False"
     When I duplicate the selected objects
     Then the object "IfcBuildingStorey/My Storey.001" exists
     And the object "IfcBuildingStorey/My Storey.001" is an "IfcBuildingStorey"
@@ -507,6 +526,8 @@ Scenario: Override duplicate move linked - with active IFC data
     And I set the "Products" property to "IfcElement"
     And I set the "Class" property to "IfcWall"
     And I click "Assign IFC Class"
+    And I look at the "Spatial Decomposition" panel
+    And I set the "is_visible" property to "TRUE"
     And the object "IfcWall/Cube" is selected
     And additionally the object "IfcBuildingStorey/My Storey" is selected
     When I press "object.duplicate_move_linked"
diff --git a/src/bonsai/test/bim/feature/root.feature b/src/bonsai/test/bim/feature/root.feature
index 1969d31708..1267e022a9 100644
--- a/src/bonsai/test/bim/feature/root.feature
+++ b/src/bonsai/test/bim/feature/root.feature
@@ -177,7 +177,6 @@ Scenario: Copy a storey - when unlocked
     Given an empty IFC project
     And I look at the "Spatial Decomposition" panel
     And I set the "is_visible" property to "TRUE"
-    And I set "scene.BIMSpatialDecompositionProperties.is_visible" to "True"
     And the object "IfcBuildingStorey/My Storey" is selected
     And I set the "is_locked" property to "FALSE"
     When I duplicate the selected objects
diff --git a/src/bonsai/test/bim/feature/spatial.feature b/src/bonsai/test/bim/feature/spatial.feature
index f5287c8474..5136479f18 100644
--- a/src/bonsai/test/bim/feature/spatial.feature
+++ b/src/bonsai/test/bim/feature/spatial.feature
@@ -223,6 +223,7 @@ Scenario: Set element visibility - Hide spatial container
 Scenario: Select spatial container
     Given an empty IFC project
     And I look at the "Spatial Decomposition" panel
+    And I set the "is_visible" property to "TRUE"
     When I select the "My Site" item in the "BIM_UL_containers_manager" list
     And I click "OBJECT_DATA"
     Then the object "IfcSite/My Site" is selected