diff --git a/_test_simple.ifc b/_test_simple.ifc
index c4821f7..5e06c3a 100644
--- a/_test_simple.ifc
+++ b/_test_simple.ifc
@@ -4591,7 +4591,7 @@ DATA;
 #5963=IFCWALL('09HorAnUL0OQlDqI_PTE63',$,'extension south wall',$,$,#8321,#8313,$,$);
 #5964=IFCWALL('3qcGaF0Yr4V9BffHarUr5$',$,'extension west wall',$,$,#8266,#6019,$,$);
 #5965=IFCWALL('0tED2GeYz9XwxeQcd9Fn49',$,'extension east wall',$,$,#8336,#8314,$,$);
-#5966=IFCWALL('2d1hv_$YX1kwDVs$GFNVtK',$,'service partition',$,$,#7099,#6021,$,$);
+#5966=IFCWALL('2d1hv_$YX1kwDVs$GFNVtK',$,'service partition',$,$,#8476,#8471,$,$);
 #5967=IFCWALL('1PaLULQ852m8y5R7mXVEHR',$,'wc-kitchen divider',$,$,#7114,#8316,$,$);
 #5978=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.33),(4.,0.33),(4.,0.),(0.,0.)));
 #5979=IFCINDEXEDPOLYCURVE(#5978,$,.F.);
@@ -4603,18 +4603,7 @@ DATA;
 #5985=IFCAXIS2PLACEMENT3D(#5982,#5983,#5984);
 #5986=IFCEXTRUDEDAREASOLID(#5981,#5985,#5980,2.5);
 #5987=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#5986));
-#5998=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.1),(4.,0.1),(4.,0.),(0.,0.)));
-#5999=IFCINDEXEDPOLYCURVE(#5998,$,.F.);
-#6000=IFCDIRECTION((0.,0.,1.));
-#6001=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#5999);
-#6002=IFCCARTESIANPOINT((0.,0.,0.));
-#6003=IFCDIRECTION((0.,0.,1.));
-#6004=IFCDIRECTION((1.,0.,0.));
-#6005=IFCAXIS2PLACEMENT3D(#6002,#6003,#6004);
-#6006=IFCEXTRUDEDAREASOLID(#6001,#6005,#6000,2.5);
-#6007=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#6006));
 #6019=IFCPRODUCTDEFINITIONSHAPE($,$,(#5987));
-#6021=IFCPRODUCTDEFINITIONSHAPE($,$,(#6007));
 #6073=IFCMATERIALLAYERSETUSAGE(#142,.AXIS2.,.POSITIVE.,0.,$);
 #6074=IFCRELASSOCIATESMATERIAL('0LY10ooOn5GPMHfHRpxqiK',$,$,$,(#5964,#5965,#5963),#6073);
 #6075=IFCOPENINGELEMENT('3V8ZCx7M9EbeKjZ3Gq3b0s',$,'service lobby door opening',$,$,#6177,#6160,$,$);
@@ -4651,8 +4640,8 @@ DATA;
 #6212=IFCSPACE('27$oFMxMb3mxS5A94OLnI_',$,'kitchenette/0',$,$,#8151,$,$,$,.INTERNAL.,$);
 #6228=IFCOPENINGELEMENT('2u4F3q7w169eyJ3M975MG0',$,'wc door opening',$,$,#7124,#6398,$,$);
 #6229=IFCOPENINGELEMENT('0ehxJvCx11IPAfp8RdmEya',$,'kitchenette door opening',$,$,#7139,#6399,$,$);
-#6230=IFCDOOR('3OgS0iC1f6sQYVDnwAtKs3',$,'wc door',$,$,#7129,#6453,$,2.08,0.91,$,$,$);
-#6231=IFCDOOR('3Lfsh275P5p9upb17NZ8ty',$,'kitchenette door',$,$,#7144,#6461,$,2.08,0.91,$,$,$);
+#6230=IFCDOOR('3OgS0iC1f6sQYVDnwAtKs3',$,'wc door',$,$,#8481,#6453,$,2.08,0.91,$,$,$);
+#6231=IFCDOOR('3Lfsh275P5p9upb17NZ8ty',$,'kitchenette door',$,$,#8486,#6461,$,2.08,0.91,$,$,$);
 #6232=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.3),(0.8,0.3),(0.8,0.),(0.,0.)));
 #6233=IFCINDEXEDPOLYCURVE(#6232,$,.F.);
 #6234=IFCDIRECTION((0.,0.,1.));
@@ -4729,7 +4718,7 @@ DATA;
 #6532=IFCHALFSPACESOLID(#6531,.F.);
 #6533=IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#6526,#6532);
 #6534=IFCSHAPEREPRESENTATION(#11,'Body','Clipping',(#6533));
-#6535=IFCOPENINGELEMENT('3XCVGMKkLCDBw_cj6UfBkX',$,'wc west window opening',$,$,#7084,#6579,$,.OPENING.);
+#6535=IFCOPENINGELEMENT('3XCVGMKkLCDBw_cj6UfBkX',$,'wc west window opening',$,$,#8491,#6579,$,.OPENING.);
 #6536=IFCOPENINGELEMENT('3Um_AZAh19VwS2QVi$vxVC',$,'wc south window opening',$,$,#8351,#6580,$,.OPENING.);
 #6537=IFCOPENINGELEMENT('0eEGfmac97Pw2r_1OHXmAZ',$,'kitchenette east window opening',$,$,#6620,#6581,$,.OPENING.);
 #6538=IFCOPENINGELEMENT('3ptm7A8Yb0K8zWa9TWO1JY',$,'kitchenette south window opening',$,$,#8366,#6582,$,.OPENING.);
@@ -4786,7 +4775,7 @@ DATA;
 #6619=IFCAXIS2PLACEMENT3D(#6616,#6617,#6618);
 #6620=IFCLOCALPLACEMENT(#8336,#6619);
 #6621=IFCRELVOIDSELEMENT('1CRb_RTTD7gQHKyE6v3jiG',$,$,$,#5963,#6538);
-#6627=IFCWINDOW('2NBW01IIrFpfL9S45NhAO2',$,'wc west window',$,$,#8276,#6684,$,$,$,$,$,$);
+#6627=IFCWINDOW('2NBW01IIrFpfL9S45NhAO2',$,'wc west window',$,$,#8501,#6684,$,$,$,$,$,$);
 #6628=IFCWINDOW('2bn9sUKCf3qfl2ZMPB3w2N',$,'wc south window',$,$,#8361,#6692,$,$,$,$,$,$);
 #6629=IFCWINDOW('14ThWkSln9MwS3k9dCmXhA',$,'kitchenette east window',$,$,#8341,#6700,$,$,$,$,$,$);
 #6630=IFCWINDOW('08qEBaJOv60QsZlHGnKpBY',$,'kitchenette south window',$,$,#8376,#6708,$,$,$,$,$,$);
@@ -5007,7 +4996,7 @@ DATA;
 #6954=IFCSHAPEREPRESENTATION(#24,'Body','Curve2D',(#6946,#6948,#6951,#6953));
 #6955=IFCREPRESENTATIONMAP(#6939,#6954);
 #6956=IFCSANITARYTERMINALTYPE('2RWyo9tFj1UxIXXqoldH5y',$,'Generic Small Sink',$,$,$,(#6935,#6955),$,$,.NOTDEFINED.);
-#6957=IFCSANITARYTERMINAL('07$4mK3SX3vwKWLS0WLkBh',$,'wc toilet',$,$,#8261,#6969,$,$);
+#6957=IFCSANITARYTERMINAL('07$4mK3SX3vwKWLS0WLkBh',$,'wc toilet',$,$,#8506,#6969,$,$);
 #6958=IFCSANITARYTERMINAL('3u4Xv2VSj1NwyZPdD_Uheg',$,'wc basin',$,$,#8256,#6985,$,$);
 #6959=IFCFURNITURE('0MuI4no5nDGP5WPlpQswVk',$,'kitchenette bench',$,$,#8171,#7001,$,$);
 #6960=IFCSANITARYTERMINAL('3ZnkgWLA12gxvj8wXAPlZr',$,'kitchenette sink',$,$,#8166,#7017,$,$);
@@ -5075,16 +5064,6 @@ DATA;
 #7022=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#7019,#7020,#7018,1.,#7021);
 #7023=IFCMAPPEDITEM(#6955,#7022);
 #7024=IFCSHAPEREPRESENTATION(#24,'Body','MappedRepresentation',(#7023));
-#7080=IFCCARTESIANPOINT((3.3125,0.,0.9));
-#7081=IFCDIRECTION((0.,0.,1.));
-#7082=IFCDIRECTION((1.,0.,0.));
-#7083=IFCAXIS2PLACEMENT3D(#7080,#7081,#7082);
-#7084=IFCLOCALPLACEMENT(#8266,#7083);
-#7095=IFCCARTESIANPOINT((-2.,-4.33,0.));
-#7096=IFCDIRECTION((0.,0.,1.));
-#7097=IFCDIRECTION((1.,0.,0.));
-#7098=IFCAXIS2PLACEMENT3D(#7095,#7096,#7097);
-#7099=IFCLOCALPLACEMENT(#92,#7098);
 #7110=IFCCARTESIANPOINT((0.,-4.33,0.));
 #7111=IFCDIRECTION((0.,0.,1.));
 #7112=IFCDIRECTION((0.,-1.,0.));
@@ -5094,22 +5073,12 @@ DATA;
 #7121=IFCDIRECTION((0.,0.,1.));
 #7122=IFCDIRECTION((1.,0.,0.));
 #7123=IFCAXIS2PLACEMENT3D(#7120,#7121,#7122);
-#7124=IFCLOCALPLACEMENT(#7099,#7123);
-#7125=IFCCARTESIANPOINT((0.,0.,0.));
-#7126=IFCDIRECTION((0.,0.,1.));
-#7127=IFCDIRECTION((1.,0.,0.));
-#7128=IFCAXIS2PLACEMENT3D(#7125,#7126,#7127);
-#7129=IFCLOCALPLACEMENT(#7124,#7128);
+#7124=IFCLOCALPLACEMENT(#8476,#7123);
 #7135=IFCCARTESIANPOINT((2.6,-0.0499999999999998,0.));
 #7136=IFCDIRECTION((0.,0.,1.));
 #7137=IFCDIRECTION((1.,0.,0.));
 #7138=IFCAXIS2PLACEMENT3D(#7135,#7136,#7137);
-#7139=IFCLOCALPLACEMENT(#7099,#7138);
-#7140=IFCCARTESIANPOINT((-1.11022302462516E-16,0.,0.));
-#7141=IFCDIRECTION((0.,0.,1.));
-#7142=IFCDIRECTION((1.,0.,0.));
-#7143=IFCAXIS2PLACEMENT3D(#7140,#7141,#7142);
-#7144=IFCLOCALPLACEMENT(#7139,#7143);
+#7139=IFCLOCALPLACEMENT(#8476,#7138);
 #7166=IFCCARTESIANPOINT((0.,0.,0.));
 #7167=IFCDIRECTION((0.,0.,1.));
 #7168=IFCDIRECTION((1.,0.,0.));
@@ -5907,21 +5876,11 @@ DATA;
 #8254=IFCDIRECTION((0.,-1.,0.));
 #8255=IFCAXIS2PLACEMENT3D(#8252,#8253,#8254);
 #8256=IFCLOCALPLACEMENT(#8246,#8255);
-#8257=IFCCARTESIANPOINT((-1.,-6.67,0.));
-#8258=IFCDIRECTION((0.,0.,1.));
-#8259=IFCDIRECTION((-1.,0.,0.));
-#8260=IFCAXIS2PLACEMENT3D(#8257,#8258,#8259);
-#8261=IFCLOCALPLACEMENT(#8246,#8260);
 #8262=IFCCARTESIANPOINT((-2.19698619842529,-3.25,0.));
 #8263=IFCDIRECTION((0.,0.,1.));
 #8264=IFCDIRECTION((0.233915656805038,-0.972256898880005,0.));
 #8265=IFCAXIS2PLACEMENT3D(#8262,#8263,#8264);
 #8266=IFCLOCALPLACEMENT(#92,#8265);
-#8272=IFCCARTESIANPOINT((6.23342240047009E-08,-2.68880197662469E-07,-2.38418579323607E-08));
-#8273=IFCDIRECTION((0.,0.,1.));
-#8274=IFCDIRECTION((1.00000000595915,1.15725347023027E-17,0.));
-#8275=IFCAXIS2PLACEMENT3D(#8272,#8273,#8274);
-#8276=IFCLOCALPLACEMENT(#7084,#8275);
 #8277=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.33),(3.261,0.33),(3.261,0.),(0.,0.)));
 #8278=IFCINDEXEDPOLYCURVE(#8277,$,.F.);
 #8279=IFCDIRECTION((0.,0.,1.));
@@ -6085,5 +6044,46 @@ DATA;
 #8458=IFCDIRECTION((0.,-1.,0.));
 #8459=IFCAXIS2PLACEMENT3D(#8456,#8457,#8458);
 #8460=IFCLOCALPLACEMENT(#8176,#8459);
+#8461=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.1),(3.268,0.1),(3.268,0.),(0.,0.)));
+#8462=IFCINDEXEDPOLYCURVE(#8461,$,.F.);
+#8463=IFCDIRECTION((0.,0.,1.));
+#8464=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#8462);
+#8465=IFCCARTESIANPOINT((0.,0.,0.));
+#8466=IFCDIRECTION((0.,0.,1.));
+#8467=IFCDIRECTION((1.,0.,0.));
+#8468=IFCAXIS2PLACEMENT3D(#8465,#8466,#8467);
+#8469=IFCEXTRUDEDAREASOLID(#8464,#8468,#8463,2.5);
+#8470=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#8469));
+#8471=IFCPRODUCTDEFINITIONSHAPE($,$,(#8470));
+#8472=IFCCARTESIANPOINT((-1.598,-4.33,0.));
+#8473=IFCDIRECTION((0.,0.,1.));
+#8474=IFCDIRECTION((1.,0.,0.));
+#8475=IFCAXIS2PLACEMENT3D(#8472,#8473,#8474);
+#8476=IFCLOCALPLACEMENT(#92,#8475);
+#8477=IFCCARTESIANPOINT((-0.402,0.,0.));
+#8478=IFCDIRECTION((0.,0.,1.));
+#8479=IFCDIRECTION((1.,0.,0.));
+#8480=IFCAXIS2PLACEMENT3D(#8477,#8478,#8479);
+#8481=IFCLOCALPLACEMENT(#7124,#8480);
+#8482=IFCCARTESIANPOINT((-0.402,0.,0.));
+#8483=IFCDIRECTION((0.,0.,1.));
+#8484=IFCDIRECTION((1.,0.,0.));
+#8485=IFCAXIS2PLACEMENT3D(#8482,#8483,#8484);
+#8486=IFCLOCALPLACEMENT(#7139,#8485);
+#8487=IFCCARTESIANPOINT((2.49942168021052,0.000341821130295905,0.9));
+#8488=IFCDIRECTION((0.,0.,1.));
+#8489=IFCDIRECTION((0.999999989899728,0.000142128615919339,0.));
+#8490=IFCAXIS2PLACEMENT3D(#8487,#8488,#8489);
+#8491=IFCLOCALPLACEMENT(#8266,#8490);
+#8497=IFCCARTESIANPOINT((0.,8.88178419700125E-16,0.));
+#8498=IFCDIRECTION((0.,0.,1.));
+#8499=IFCDIRECTION((1.,-2.01525358654416E-17,0.));
+#8500=IFCAXIS2PLACEMENT3D(#8497,#8498,#8499);
+#8501=IFCLOCALPLACEMENT(#8491,#8500);
+#8502=IFCCARTESIANPOINT((-0.75,-6.67,0.));
+#8503=IFCDIRECTION((0.,0.,1.));
+#8504=IFCDIRECTION((-1.,0.,0.));
+#8505=IFCAXIS2PLACEMENT3D(#8502,#8503,#8504);
+#8506=IFCLOCALPLACEMENT(#8246,#8505);
 ENDSEC;
 END-ISO-10303-21;