@itwin/core-backend 5.10.0-dev.6 → 5.10.0-dev.8

package/lib/esm/test/hubaccess/SemanticRebase.test.js

@@ -55,371 +55,371 @@ class TestIModel {
     /** Reusable schema definitions for testing rebase with schema transformations */
     static schemas = {
         /** Base schema v01.00.00 with classes A, C, D */
-        v01x00x00: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x00: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.01 - Adds PropC2 to class C (trivial additive change) */
-        v01x00x01AddPropC2: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropC2" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x01AddPropC2: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropC2" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.02 - Adds PropD2 to class D (trivial additive change) */
-        v01x00x02AddPropD2: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropC2" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-        <ECProperty propertyName="PropD2" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02AddPropD2: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropC2" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+        <ECProperty propertyName="PropD2" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.02 - Moves PropC from C to A (requires data transformation) on top of v01.00.01 */
-        v01x00x02MovePropCToA: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC2" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02MovePropCToA: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC2" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.03 - Builds on top of v01.00.02 and in addition moves PropD to base, so we can have incoming and local transforming changes */
-        v01x00x03MovePropCAndD: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.03" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC2" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD2" typeName="string"/>
-      </ECEntityClass>
+        v01x00x03MovePropCAndD: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.03" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC2" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD2" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.01 (incompatible variant) - Adds PropC3 instead of PropC2 to class C (same version) */
-        v01x00x01AddPropC3Incompatible: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropC3" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x01AddPropC3Incompatible: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropC3" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.02 (incompatible variant) - Adds PropC3 instead of PropC2 to class C (higher version) */
-        v01x00x02AddPropC3Incompatible: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropC3" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02AddPropC3Incompatible: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropC3" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.02 (incompatible variant) - Adds PropC2 (higher version, different type) */
-        v01x00x02AddPropC2Incompatible: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropC2" typeName="int"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02AddPropC2Incompatible: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropC2" typeName="int"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01.00.03 - Adds PropC2 as string (used to test incompatibility when reinstated on top of v01.00.02 with PropC2:int) */
-        v01x00x03AddPropC2: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.03" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropC2" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x03AddPropC2: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.03" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropC2" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
     };
     /** Additional schemas for extended edge-case tests */
     static extendedSchemas = {
         /** v01x00x01 - Adds CUniqueAspect class (ElementUniqueAspect subclass) with AspectProp for aspect rebase tests */
-        v01x00x01WithAspect: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="CUniqueAspect" modifier="None">
-        <BaseClass>bis:ElementUniqueAspect</BaseClass>
-        <ECProperty propertyName="AspectProp" typeName="string"/>
-      </ECEntityClass>
+        v01x00x01WithAspect: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="CUniqueAspect" modifier="None">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="AspectProp" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x02 - Extends v01WithAspect by adding AspectProp2 to CUniqueAspect (trivial aspect schema evolution) */
-        v01x00x02WithAspectProp2: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="CUniqueAspect" modifier="None">
-        <BaseClass>bis:ElementUniqueAspect</BaseClass>
-        <ECProperty propertyName="AspectProp" typeName="string"/>
-        <ECProperty propertyName="AspectProp2" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02WithAspectProp2: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="CUniqueAspect" modifier="None">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="AspectProp" typeName="string"/>
+        <ECProperty propertyName="AspectProp2" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x01 - Adds new entity class E extending A with PropE (tests new class addition) */
-        v01x00x01AddClassE: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="E">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropE" typeName="string"/>
-      </ECEntityClass>
+        v01x00x01AddClassE: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="E">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropE" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x02 - Extends v01AddClassE by adding PropE2 to class E */
-        v01x00x02AddClassEPropE2: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="E">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropE" typeName="string"/>
-        <ECProperty propertyName="PropE2" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02AddClassEPropE2: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="E">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropE" typeName="string"/>
+        <ECProperty propertyName="PropE2" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x01 - Adds multi-type properties (int, double, boolean) to class C for type-variation tests */
-        v01x00x01MultiTypeProps: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropCInt" typeName="int"/>
-        <ECProperty propertyName="PropCDouble" typeName="double"/>
-        <ECProperty propertyName="PropCBool" typeName="boolean"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x01MultiTypeProps: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropCInt" typeName="int"/>
+        <ECProperty propertyName="PropCDouble" typeName="double"/>
+        <ECProperty propertyName="PropCBool" typeName="boolean"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x02 - Extends v01MultiTypeProps by adding PropD2 to class D */
-        v01x00x02MultiTypePropsExtended: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropCInt" typeName="int"/>
-        <ECProperty propertyName="PropCDouble" typeName="double"/>
-        <ECProperty propertyName="PropCBool" typeName="boolean"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-        <ECProperty propertyName="PropD2" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02MultiTypePropsExtended: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropCInt" typeName="int"/>
+        <ECProperty propertyName="PropCDouble" typeName="double"/>
+        <ECProperty propertyName="PropCBool" typeName="boolean"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+        <ECProperty propertyName="PropD2" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x01 - Adds multi-type properties (int, double, boolean) to class C for type-variation tests */
-        v01x00x02MultiTypePropsMovePropDToA: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropCInt" typeName="int"/>
-        <ECProperty propertyName="PropCDouble" typeName="double"/>
-        <ECProperty propertyName="PropCBool" typeName="boolean"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-      </ECEntityClass>
+        v01x00x02MultiTypePropsMovePropDToA: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropCInt" typeName="int"/>
+        <ECProperty propertyName="PropCDouble" typeName="double"/>
+        <ECProperty propertyName="PropCBool" typeName="boolean"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x02 - Moves PropD from class D to class A (transforming change for D, analogous to MovePropCToA) */
-        v01x00x02MovePropDToA: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-      </ECEntityClass>
+        v01x00x02MovePropDToA: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x01 - Adds a binary property (PropCBin) to class C */
-        v01x00x01WithBinaryProp: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropCBin" typeName="binary"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
+        v01x00x01WithBinaryProp: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropCBin" typeName="binary"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
         /** v01x00x02 - Extends v01x00x01WithBinaryProp with PropD2 on class D (trivial additive change) */
-        v01x00x02WithBinaryPropAndPropD2: `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropC" typeName="string"/>
-        <ECProperty propertyName="PropCBin" typeName="binary"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-        <ECProperty propertyName="PropD2" typeName="string"/>
-      </ECEntityClass>
+        v01x00x02WithBinaryPropAndPropD2: `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropC" typeName="string"/>
+        <ECProperty propertyName="PropCBin" typeName="binary"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+        <ECProperty propertyName="PropD2" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`,
     };
     /**
@@ -600,7 +600,7 @@ class TestIModel {
  * Test suite for rebase logic with schema changes that require data transformations.
  */
 describe("Semantic Rebase", function () {
-    this.timeout(60000); // operations can be slow
+    this.timeout(90000); // operations can be slow
     let t;
     before(async () => {
         await TestUtils.shutdownBackend(); // Automatically TestUtils.startBackend() is called before every test suite starts we need to shut tht down and startup our new TestUtils with semantic rebase on
@@ -1236,6 +1236,38 @@ describe("Semantic Rebase", function () {
         const schema = t.local.getSchemaProps("TestDomain");
         chai.expect(schema.version).to.equal("01.00.02", "Local schema transformation should be preserved");
     });
+    it("bulk local elements survive semantic rebase with incoming transforming schema change", async function () {
+        const runBulkRebaseTest = async (count) => {
+            t = await TestIModel.initialize(`BulkElements${count}`);
+            const farTxn = startTestTxn(t.far, `${count} elements rebase far`);
+            const localTxn = startTestTxn(t.local, `${count} elements rebase local`);
+            await t.local.locks.acquireLocks({ shared: t.drawingModelId });
+            const elementIds = [];
+            for (let i = 0; i < count; i++) {
+                elementIds.push(t.insertElement(localTxn, "TestDomain:C", {
+                    propA: `bulk_a_${i}`,
+                    propC: `bulk_c_${i}`,
+                }));
+            }
+            localTxn.saveChanges(`local insert ${count} elements`);
+            await importSchemaStrings(farTxn, [TestIModel.schemas.v01x00x02MovePropCToA]);
+            await pushChanges(farTxn, "far move PropC to A");
+            await pullChanges(localTxn);
+            t.local.clearCaches();
+            for (let i = 0; i < count; i++) {
+                const element = t.getElementProps(t.local, elementIds[i]);
+                chai.expect(element.propA).to.equal(`bulk_a_${i}`, `Element ${i} propA should be preserved`);
+                chai.expect(element.propC).to.equal(`bulk_c_${i}`, `Element ${i} propC should be preserved after transform`);
+            }
+            const schema = t.local.getSchemaProps("TestDomain");
+            chai.expect(schema.version).to.equal("01.00.02", "Schema should be transformed to v01.00.02");
+            t.shutdown();
+            t = undefined;
+        };
+        await runBulkRebaseTest(133);
+        await runBulkRebaseTest(100);
+        await runBulkRebaseTest(101);
+    });
     it("should fail when importing schema with unsaved data changes", async () => {
         t = await TestIModel.initialize("UnsavedDataChangesSchemaImport");
         const localTxn = startTestTxn(t.local, "should fail when importing schema with unsaved data changes local");
@@ -1258,7 +1290,7 @@ describe("Semantic Rebase", function () {
  * Test suite for tests related to rebase logic with schema changes (for indirect changes) that require data transformations.
  */
 describe("Semantic Rebase with indirect changes", function () {
-    this.timeout(60000); // operations can be slow
+    this.timeout(90000); // operations can be slow
     let t;
     before(async () => {
         await TestUtils.shutdownBackend(); // Automatically TestUtils.startBackend() is called before every test suite starts we need to shut tht down and startup our new TestUtils with semantic rebase on
@@ -1543,7 +1575,7 @@ describe("Semantic Rebase with indirect changes", function () {
  * Test suite for data conflicts, conflict handlers, lifecycle events, and mixed schema+conflict scenarios during semantic rebase.
  */
 describe("Semantic Rebase - Data Correctness Under Conflict", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -1755,7 +1787,7 @@ describe("Semantic Rebase - Data Correctness Under Conflict", function () {
  * Tests scenarios where one or both sides import schemas in multiple sequential steps before the rebase.
  */
 describe("Semantic Rebase - Multi-Step Schema Upgrade Chains", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -1939,7 +1971,7 @@ describe("Semantic Rebase - Multi-Step Schema Upgrade Chains", function () {
  * Tests that aspect insert/update/delete operations are correctly captured and reinstated.
  */
 describe("Semantic Rebase - ElementAspect Changes", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2146,7 +2178,7 @@ describe("Semantic Rebase - ElementAspect Changes", function () {
  * Ensures int, double, and boolean property values are preserved correctly through rebase.
  */
 describe("Semantic Rebase - Property Type Variations", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2334,7 +2366,7 @@ describe("Semantic Rebase - Property Type Variations", function () {
  * Edge case where both local and far delete the same element independently.
  */
 describe("Semantic Rebase - Both Sides Delete Same Element", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2392,7 +2424,7 @@ describe("Semantic Rebase - Both Sides Delete Same Element", function () {
  * Tests interactions when three separate briefcases are involved in schema+data operations.
  */
 describe("Semantic Rebase - Three Briefcase Scenarios", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2508,7 +2540,7 @@ describe("Semantic Rebase - Three Briefcase Scenarios", function () {
  * pulls multiple times before pushing, accumulating rebase operations.
  */
 describe("Semantic Rebase - Multiple Pulls Without Push", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2591,7 +2623,7 @@ describe("Semantic Rebase - Multiple Pulls Without Push", function () {
  * Tests that newly added entity classes and their instances survive semantic rebase.
  */
 describe("Semantic Rebase - New Class Addition to Schema", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2667,25 +2699,25 @@ describe("Semantic Rebase - New Class Addition to Schema", function () {
         localTxn = startTestTxn(t.local, "N3 local 2");
         // Far imports transforming schema: moves PropC from C to A, AND adds class E (v01.00.02 + E)
         // We use a combined schema for this
-        const v01x00x02WithBothChanges = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
-      <ECEntityClass typeName="A">
-        <BaseClass>bis:GraphicalElement2d</BaseClass>
-        <ECProperty propertyName="PropA" typeName="string"/>
-        <ECProperty propertyName="PropC" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="C">
-        <BaseClass>A</BaseClass>
-      </ECEntityClass>
-      <ECEntityClass typeName="D">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropD" typeName="string"/>
-      </ECEntityClass>
-      <ECEntityClass typeName="E">
-        <BaseClass>A</BaseClass>
-        <ECProperty propertyName="PropE" typeName="string"/>
-      </ECEntityClass>
+        const v01x00x02WithBothChanges = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="td" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+      <ECSchemaReference name="BisCore" version="01.00.23" alias="bis"/>
+      <ECEntityClass typeName="A">
+        <BaseClass>bis:GraphicalElement2d</BaseClass>
+        <ECProperty propertyName="PropA" typeName="string"/>
+        <ECProperty propertyName="PropC" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="C">
+        <BaseClass>A</BaseClass>
+      </ECEntityClass>
+      <ECEntityClass typeName="D">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropD" typeName="string"/>
+      </ECEntityClass>
+      <ECEntityClass typeName="E">
+        <BaseClass>A</BaseClass>
+        <ECProperty propertyName="PropE" typeName="string"/>
+      </ECEntityClass>
     </ECSchema>`;
         await importSchemaStrings(farTxn, [v01x00x02WithBothChanges]);
         await pushChanges(farTxn, "far import transform+new class");
@@ -2719,7 +2751,7 @@ describe("Semantic Rebase - New Class Addition to Schema", function () {
  * Tests boundary conditions like importing schema while rebasing, concurrent pull attempts, etc.
  */
 describe("Semantic Rebase - Guard Conditions and Error Paths", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -2839,7 +2871,7 @@ describe("Semantic Rebase - Guard Conditions and Error Paths", function () {
  * that need to be correctly captured and reinstated during semantic rebase.
  */
 describe("Semantic Rebase - Complex Insert-Update-Delete Sequences", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -3004,7 +3036,7 @@ describe("Semantic Rebase - Complex Insert-Update-Delete Sequences", function ()
  * Tests that rebase folder state is correctly managed in unusual lifecycle scenarios.
  */
 describe("Semantic Rebase - Cleanup and Folder Lifecycle", function () {
-    this.timeout(60000);
+    this.timeout(90000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();
@@ -3097,7 +3129,7 @@ describe("Semantic Rebase - Cleanup and Folder Lifecycle", function () {
     });
 });
 describe("Semantic Rebase - Multi-Pull Verification", function () {
-    this.timeout(90000);
+    this.timeout(120000);
     let t;
     before(async () => {
         await TestUtils.shutdownBackend();