diff --git a/Documentation/testcases/partof/pass-the_container_may_be_indirect.ids b/Documentation/testcases/partof/fail-the_container_must_be_related_using_specified_relation_2_2.ids
similarity index 82%
rename from Documentation/testcases/partof/pass-the_container_may_be_indirect.ids
rename to Documentation/testcases/partof/fail-the_container_must_be_related_using_specified_relation_2_2.ids
index 15e97be..98fa683 100644
--- a/Documentation/testcases/partof/pass-the_container_may_be_indirect.ids
+++ b/Documentation/testcases/partof/fail-the_container_must_be_related_using_specified_relation_2_2.ids
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd" xmlns="http://standards.buildingsmart.org/IDS">
   <info>
-    <title>The container may be indirect</title>
+    <title>The container must be related using specified relation 2/2</title>
     <description>Generated via code automation in the Ids Repository on github.</description>
   </info>
   <specifications>
-    <specification name="The container may be indirect" ifcVersion="IFC2X3 IFC4">
+    <specification name="The container must be related using specified relation 2/2" ifcVersion="IFC2X3 IFC4">
       <applicability maxOccurs="unbounded">
         <entity>
           <name>
diff --git a/Documentation/testcases/partof/fail-the_container_must_be_related_using_specified_relation_2_2.ifc b/Documentation/testcases/partof/fail-the_container_must_be_related_using_specified_relation_2_2.ifc
new file mode 100644
index 0000000..fd0ab7b
--- /dev/null
+++ b/Documentation/testcases/partof/fail-the_container_must_be_related_using_specified_relation_2_2.ifc
@@ -0,0 +1,15 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('','2022-10-07T13:48:44',(),(),'IfcOpenShell v0.7.0-dc67287d','IfcOpenShell v0.7.0-dc67287d','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCBEAM('0eA6m4fELI9QBIhP3wiLAp',$,$,$,$,$,$,$,$);
+#2=IFCSPACE('3Agm079vPIYBL4JExVrhD5',$,$,$,$,$,$,$,$,$,$);
+#3=IFCRELAGGREGATES('05rScmOVzMoQXOfbYdtLYj',$,$,$,#2,(#1));
+#10=IFCPROJECT('1eA6m4fELI9QBIhP3wiLAp',$,'TestProject',$,$,$,$,$,$);
+#11=IFCRELAGGREGATES('2eA6m4fELI9QBIhP3wiLAp',$,$,$,#10,(#2));
+ENDSEC;
+END-ISO-10303-21;
+
diff --git a/Documentation/testcases/partof/fail-the_containment_can_be_indirect_2_2.ids b/Documentation/testcases/partof/fail-the_containment_can_be_indirect_2_2.ids
new file mode 100644
index 0000000..5ae6131
--- /dev/null
+++ b/Documentation/testcases/partof/fail-the_containment_can_be_indirect_2_2.ids
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd" xmlns="http://standards.buildingsmart.org/IDS">
+  <info>
+    <title>The containment can be indirect 2/2</title>
+    <description>Generated via code automation in the Ids Repository on github.</description>
+  </info>
+  <specifications>
+    <specification name="The containment can be indirect 2/2" ifcVersion="IFC2X3 IFC4">
+      <applicability maxOccurs="unbounded">
+        <entity>
+          <name>
+            <simpleValue>IFCBEAM</simpleValue>
+          </name>
+        </entity>
+      </applicability>
+      <requirements>
+        <partOf relation="IFCRELAGGREGATES">
+          <entity>
+            <name>
+              <simpleValue>IFCBUILDING</simpleValue>
+            </name>
+          </entity>
+        </partOf>
+      </requirements>
+    </specification>
+  </specifications>
+</ids>
\ No newline at end of file
diff --git a/Documentation/testcases/partof/pass-the_container_may_be_indirect.ifc b/Documentation/testcases/partof/fail-the_containment_can_be_indirect_2_2.ifc
similarity index 63%
rename from Documentation/testcases/partof/pass-the_container_may_be_indirect.ifc
rename to Documentation/testcases/partof/fail-the_containment_can_be_indirect_2_2.ifc
index 2544825..8a565ca 100644
--- a/Documentation/testcases/partof/pass-the_container_may_be_indirect.ifc
+++ b/Documentation/testcases/partof/fail-the_containment_can_be_indirect_2_2.ifc
@@ -5,10 +5,12 @@ FILE_NAME('','2022-10-07T13:48:44',(),(),'IfcOpenShell v0.7.0-dc67287d','IfcOpen
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCSLAB('1hqIFTRjfV6AWq_bMtnZwI',$,$,$,$,$,$,$,$);
+#1=IFCSPACE('3Agm079vPIYBL4JExVrhD5',$,$,$,$,$,$,$,$,$,$);
 #2=IFCBEAM('0eA6m4fELI9QBIhP3wiLAp',$,$,$,$,$,$,$,$);
 #3=IFCRELAGGREGATES('05rScmOVzMoQXOfbYdtLYj',$,$,$,#1,(#2));
-#4=IFCSPACE('3Agm079vPIYBL4JExVrhD5',$,$,$,$,$,$,$,$,$,$);
+#4=IFCBUILDING('1hqIFTRjfV6AWq_bMtnZwI',$,$,$,$,$,$,$,$,$,$,$);
 #5=IFCRELCONTAINEDINSPATIALSTRUCTURE('0BbkGoC6vPvRW13UT7D8zH',$,$,$,(#1),#4);
+#10=IFCPROJECT('1eA6m4fELI9QBIhP3wiLAp',$,'TestProject',$,$,$,$,$,$);
+#11=IFCRELAGGREGATES('2eA6m4fELI9QBIhP3wiLAp',$,$,$,#10,(#4));
 ENDSEC;
 END-ISO-10303-21;
diff --git a/Documentation/testcases/partof/pass-the_container_must_be_related_using_specified_relation_1_2.ids b/Documentation/testcases/partof/pass-the_container_must_be_related_using_specified_relation_1_2.ids
new file mode 100644
index 0000000..6adf828
--- /dev/null
+++ b/Documentation/testcases/partof/pass-the_container_must_be_related_using_specified_relation_1_2.ids
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd" xmlns="http://standards.buildingsmart.org/IDS">
+  <info>
+    <title>The container must be related using specified relation 1/2</title>
+    <description>Generated via code automation in the Ids Repository on github.</description>
+  </info>
+  <specifications>
+    <specification name="The container must be related using specified relation 1/2" ifcVersion="IFC2X3 IFC4">
+      <applicability maxOccurs="unbounded">
+        <entity>
+          <name>
+            <simpleValue>IFCBEAM</simpleValue>
+          </name>
+        </entity>
+      </applicability>
+      <requirements>
+        <partOf relation="IFCRELCONTAINEDINSPATIALSTRUCTURE">
+          <entity>
+            <name>
+              <simpleValue>IFCSPACE</simpleValue>
+            </name>
+          </entity>
+        </partOf>
+      </requirements>
+    </specification>
+  </specifications>
+</ids>
\ No newline at end of file
diff --git a/Documentation/testcases/partof/pass-the_container_must_be_related_using_specified_relation_1_2.ifc b/Documentation/testcases/partof/pass-the_container_must_be_related_using_specified_relation_1_2.ifc
new file mode 100644
index 0000000..73d4c26
--- /dev/null
+++ b/Documentation/testcases/partof/pass-the_container_must_be_related_using_specified_relation_1_2.ifc
@@ -0,0 +1,14 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('','2022-10-07T13:48:44',(),(),'IfcOpenShell v0.7.0-dc67287d','IfcOpenShell v0.7.0-dc67287d','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCBEAM('0eA6m4fELI9QBIhP3wiLAp',$,$,$,$,$,$,$,$);
+#2=IFCSPACE('3Agm079vPIYBL4JExVrhD5',$,$,$,$,$,$,$,$,$,$);
+#3=IFCRELCONTAINEDINSPATIALSTRUCTURE('0BbkGoC6vPvRW13UT7D8zH',$,$,$,(#1),#2);
+#10=IFCPROJECT('1eA6m4fELI9QBIhP3wiLAp',$,'TestProject',$,$,$,$,$,$);
+#11=IFCRELAGGREGATES('2eA6m4fELI9QBIhP3wiLAp',$,$,$,#10,(#2));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/Documentation/testcases/partof/pass-the_containment_can_be_indirect_1_2.ids b/Documentation/testcases/partof/pass-the_containment_can_be_indirect_1_2.ids
new file mode 100644
index 0000000..43e386d
--- /dev/null
+++ b/Documentation/testcases/partof/pass-the_containment_can_be_indirect_1_2.ids
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd" xmlns="http://standards.buildingsmart.org/IDS">
+  <info>
+    <title>The containment can be indirect 1/2</title>
+    <description>Generated via code automation in the Ids Repository on github.</description>
+  </info>
+  <specifications>
+    <specification name="The containment can be indirect 1/2" ifcVersion="IFC2X3 IFC4">
+      <applicability maxOccurs="unbounded">
+        <entity>
+          <name>
+            <simpleValue>IFCBEAM</simpleValue>
+          </name>
+        </entity>
+      </applicability>
+      <requirements>
+        <partOf relation="IFCRELAGGREGATES">
+          <entity>
+            <name>
+              <simpleValue>IFCBUILDING</simpleValue>
+            </name>
+          </entity>
+        </partOf>
+      </requirements>
+    </specification>
+  </specifications>
+</ids>
\ No newline at end of file
diff --git a/Documentation/testcases/partof/pass-the_containment_can_be_indirect_1_2.ifc b/Documentation/testcases/partof/pass-the_containment_can_be_indirect_1_2.ifc
new file mode 100644
index 0000000..418d81b
--- /dev/null
+++ b/Documentation/testcases/partof/pass-the_containment_can_be_indirect_1_2.ifc
@@ -0,0 +1,16 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('','2022-10-07T13:48:44',(),(),'IfcOpenShell v0.7.0-dc67287d','IfcOpenShell v0.7.0-dc67287d','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCSPACE('3Agm079vPIYBL4JExVrhD5',$,$,$,$,$,$,$,$,$,$);
+#2=IFCBEAM('0eA6m4fELI9QBIhP3wiLAp',$,$,$,$,$,$,$,$);
+#3=IFCRELAGGREGATES('05rScmOVzMoQXOfbYdtLYj',$,$,$,#1,(#2));
+#4=IFCBUILDING('1hqIFTRjfV6AWq_bMtnZwI',$,$,$,$,$,$,$,$,$,$,$);
+#5=IFCRELAGGREGATES('15rScmOVzMoQXOfbYdtLYj',$,$,$,#4,(#1));
+#10=IFCPROJECT('1eA6m4fELI9QBIhP3wiLAp',$,'TestProject',$,$,$,$,$,$);
+#11=IFCRELAGGREGATES('2eA6m4fELI9QBIhP3wiLAp',$,$,$,#10,(#4));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/Documentation/testcases/scripts.md b/Documentation/testcases/scripts.md
index a8f095e..3f0481c 100644
--- a/Documentation/testcases/scripts.md
+++ b/Documentation/testcases/scripts.md
@@ -1704,15 +1704,42 @@ Requirements:
 PartOf: Pattern(''.*''),IFCRELCONTAINEDINSPATIALSTRUCTURE
 ```
 
-### The container may be indirect
+### The container must be related using specified relation 1/2
 
-``` ids partof/pass-the_container_may_be_indirect.ids
-The container may be indirect
+``` ids partof/pass-the_container_must_be_related_using_specified_relation_1_2.ids
+The container must be related using specified relation 1/2
 Entity: ''IFCBEAM''
 Requirements:
 PartOf: ''IFCSPACE'',IFCRELCONTAINEDINSPATIALSTRUCTURE
 ```
 
+### The container must be related using specified relation 2/2
+
+``` ids partof/fail-the_container_must_be_related_using_specified_relation_2_2.ids
+The container must be related using specified relation 2/2
+Entity: ''IFCBEAM''
+Requirements:
+PartOf: ''IFCSPACE'',IFCRELCONTAINEDINSPATIALSTRUCTURE
+```
+
+### The containment can be indirect 1/2
+
+``` ids partof/pass-the_containment_can_be_indirect_1_2.ids
+The containment can be indirect 1/2
+Entity: ''IFCBEAM''
+Requirements:
+PartOf: ''IFCBUILDING'',IFCRELAGGREGATES
+```
+
+### The containment can be indirect 2/2
+
+``` ids partof/fail-the_containment_can_be_indirect_2_2.ids
+The containment can be indirect 2/2
+Entity: ''IFCBEAM''
+Requirements:
+PartOf: ''IFCBUILDING'',IFCRELAGGREGATES
+```
+
 ### The container predefined type must match exactly 1/2
 
 ``` ids partof/fail-the_container_predefined_type_must_match_exactly_1_2.ids