diff --git a/src/blenderbim/test/bim/feature/brick.feature b/src/blenderbim/test/bim/feature/brick.feature
index 8d92c51956..f48547609a 100644
--- a/src/blenderbim/test/bim/feature/brick.feature
+++ b/src/blenderbim/test/bim/feature/brick.feature
@@ -20,7 +20,7 @@ Scenario: View Brick class
 Scenario: View Brick item
     Given an empty Blender session
     And I press "bim.load_brick_project(filepath='{cwd}/test/files/spaces.ttl')"
-    When I press "bim.view_brick_item(item='https://brickschema.org/schema/Brick#Building')"
+    When I press "bim.view_brick_item(item='https://example.org/digitaltwin#lighting_zone_1')"
     Then nothing happens
 
 Scenario: Rewind Brick class
@@ -87,17 +87,11 @@ Scenario: Add Brick relation - vanilla Brick with no IFC
     Given an empty Blender session
     And I press "bim.load_brick_project(filepath='{cwd}/test/files/spaces.ttl')"
     And I set "scene.BIMBrickProperties.namespace" to "https://example.org/digitaltwin#"
-    And I set "scene.BIMBrickProperties.brick_entity_create_type" to "Location"
-    And I set "scene.BIMBrickProperties.new_brick_label" to "abc123"
-    And I set "scene.BIMBrickProperties.brick_entity_class" to "Room"
-    And I press "bim.add_brick"
     And I press "bim.view_brick_class(brick_class='Lighting_Zone')"
     And I set "scene.BIMBrickProperties.active_brick_index" to "0"
-    And I set "scene.BIMRootProperties.brick_create_relations_toggled" to "True"
-    And I set "scene.BIMRootProperties.new_brick_relation_namespace" to "https://example.org/digitaltwin#"
-    And I set "scene.BIMRootProperties.new_brick_relation_type" to "hasPart"
-    And I set "scene.BIMRootProperties.new_brick_relation_object" to "xyz789"
-    When I press "bim.add_brick_relation()"
+    And I set "scene.BIMBrickProperties.brick_create_relations_toggled" to "True"
+    And I set "scene.BIMBrickProperties.new_brick_relation_object" to "xyz789"
+    When I press "bim.add_brick_relation"
     Then nothing happens
 
 Scenario: Add Brick relation - vanilla Brick with no IFC and with split screen
@@ -106,15 +100,14 @@ Scenario: Add Brick relation - vanilla Brick with no IFC and with split screen
     And I set "scene.BIMBrickProperties.namespace" to "https://example.org/digitaltwin#"
     And I set "scene.BIMBrickProperties.brick_entity_create_type" to "Location"
     And I set "scene.BIMBrickProperties.new_brick_label" to "abc123"
-    And I set "scene.BIMBrickProperties.brick_entity_class" to "Room"
+    And I set "scene.BIMBrickProperties.brick_entity_class" to "https://brickschema.org/schema/Brick#Room"
     And I press "bim.add_brick"
     And I press "bim.view_brick_class(brick_class='Lighting_Zone')"
     And I set "scene.BIMBrickProperties.active_brick_index" to "0"
-    And I set "scene.BIMRootProperties.split_screen_toggled" to "True"
-    And I press "bim.view_brick_class(brick_class='Room')"
+    And I set "scene.BIMBrickProperties.split_screen_toggled" to "True"
+    And I press "bim.view_brick_class(brick_class='Room', split_screen=True)"
     And I set "scene.BIMBrickProperties.split_screen_active_brick_index" to "0"
-    And I set "scene.BIMRootProperties.brick_create_relations_toggled" to "True"
-    And I set "scene.BIMRootProperties.new_brick_relation_type" to "hasPart"
+    And I set "scene.BIMBrickProperties.brick_create_relations_toggled" to "True"
     When I press "bim.add_brick_relation"
     Then nothing happens
 
@@ -152,14 +145,14 @@ Scenario: Change viewer list root - split screen
     Given an empty Blender session
     And I press "bim.load_brick_project(filepath='{cwd}/test/files/spaces.ttl')"
     And I set "scene.BIMBrickProperties.set_list_root_toggled" to "True"
-    And I set "scene.BIMRootProperties.split_screen_toggled" to "True"
+    And I set "scene.BIMBrickProperties.split_screen_toggled" to "True"
     When I set "scene.BIMBrickProperties.split_screen_brick_list_root" to "Location"
     Then nothing happens
 
 Scenario: Toggle split screen
     Given an empty Blender session
     And I press "bim.load_brick_project(filepath='{cwd}/test/files/spaces.ttl')"
-    When I set "scene.BIMRootProperties.split_screen_toggled" to "True"
+    When I set "scene.BIMBrickProperties.split_screen_toggled" to "True"
     Then nothing happens
 
 Scenario: Set active namespace