diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
index c14f10bed51db0b623f2440fbff26b80dcbddc6f..fa95bdca66796f0e301933c6f6423d3fd72ae078 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
@@ -16,49 +16,49 @@
             <VoltageLevel>
                 <Voltage>400</Voltage>
                 <ContinuousTorque>200.00</ContinuousTorque>
-            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-            <OverloadTorque>400.00</OverloadTorque>
-            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
-            <OverloadDuration>30.00</OverloadDuration>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
                 <MaxTorqueCurve>
-                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
-                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
                 </MaxTorqueCurve>
                 <PowerMap gear="1">
-                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
-                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
                 </PowerMap>
                 <PowerMap gear="2">
-                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
-                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
                 </PowerMap>
             </VoltageLevel>
             <VoltageLevel>
                 <Voltage>600</Voltage>
                 <ContinuousTorque>200.00</ContinuousTorque>
-            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-            <OverloadTorque>400.00</OverloadTorque>
-            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
-            <OverloadDuration>30.00</OverloadDuration>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
                 <MaxTorqueCurve>
-                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
-                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
                 </MaxTorqueCurve>
                 <PowerMap gear="1">
-                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
-                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
                 </PowerMap>
                 <PowerMap gear="2">
-                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
-                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
-                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
                 </PowerMap>
             </VoltageLevel>
             <DragCurve>
@@ -76,7 +76,7 @@
                     <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                 </di:Transforms>
                 <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                <di:DigestValue>655T60jN3MstLvX3j5bmvY4kLft2uJbQz2kEk/LIfo8=</di:DigestValue>
+                <di:DigestValue>vvxJmw6PIWC5lHtnDAYVoxy6sF97g24Ti/QDlUq09tc=</di:DigestValue>
             </di:Reference>
         </v2.10.1:Signature>
     </tns:ElectricMachineSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
index f4a38b837f4d33777a2f4cb8d56dce08a646f890..112accac2018dcf0b593c26eaa3d269ae8a28e2a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
@@ -25,10 +25,10 @@
 					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
 				</MaxTorqueCurve>
 				<PowerMap>
-					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
-					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 			</VoltageLevel>
 			<VoltageLevel>
@@ -43,10 +43,10 @@
 					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
 				</MaxTorqueCurve>
 				<PowerMap>
-					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
-					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 			</VoltageLevel>
 			<DragCurve>
@@ -64,7 +64,7 @@
 					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 				</di:Transforms>
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-				<di:DigestValue>s2YFYllDgw5jrF+W6Pc9cF4aQfsswnICqlWYgqg9NPI=</di:DigestValue>
+				<di:DigestValue>TilK8FUXim9VK3Jy2qTIdogjpWvSF0cj/Ny1fyuoajk=</di:DigestValue>
 			</di:Reference>
 		</v2.10.1:Signature>
 	</tns:ElectricMachineSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
index 99c16a8ec0e1eb6597aa6ca574a44b3498b64547..436db23720b845b5b061908bccfa9c5e14b143ae 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
@@ -24,10 +24,10 @@
 					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
 				</MaxTorqueCurve>
 				<PowerMap>
-					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
-					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 			</VoltageLevel>
 			<DragCurve>
@@ -42,7 +42,7 @@
 					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 				</di:Transforms>
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-				<di:DigestValue>ZDzYMLXTbvq6O8mR3OE8ii2v4SHgJ6nieqw6XXINaF0=</di:DigestValue>
+				<di:DigestValue>CunnDxsiE9kciX+v9oeEGADZpEc88NtfMtmrHyJkCQ0=</di:DigestValue>
 			</di:Reference>
 		</v2.10.1:Signature>
 	</tns:ElectricMachineSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
index a4ecdb97d102d35b3fb0e653e94aff114d333095..fc7fd1971752e83b622d17a3e1a209e03994dbf5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
@@ -34,16 +34,16 @@
 					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
 				</MaxTorqueCurve>
 				<PowerMap gear="1">
-					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
-					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 				<PowerMap gear="2">
-					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
 					<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
-					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
 					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
 				</PowerMap>
 			</VoltageLevel>
 			<VoltageLevel>
@@ -58,16 +58,16 @@
 					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
 				</MaxTorqueCurve>
 				<PowerMap gear="1">
-					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
-					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 				<PowerMap gear="2">
-					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
 					<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
-					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
 					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
 				</PowerMap>
 			</VoltageLevel>
 			<DragCurve gear="1">
@@ -89,7 +89,7 @@
 					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 				</di:Transforms>
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-				<di:DigestValue>YC6JEnUe+0DpaRLPBYJfmJqsXHlIkdKUEyKh6Pv4Qi8=</di:DigestValue>
+				<di:DigestValue>3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=</di:DigestValue>
 			</di:Reference>
 		</v2.10.1:Signature>
 	</tns:IEPC>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
index 6270dbf86851a10883eb5f6fb0316cd6057d277d..d6bf3f39428e4519a673423f1a916185c0ffe273 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
@@ -33,10 +33,10 @@
 					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
 				</MaxTorqueCurve>
 				<PowerMap>
-					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
-					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
 					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 			</VoltageLevel>
 			<DragCurve>
@@ -51,7 +51,7 @@
 					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 				</di:Transforms>
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-				<di:DigestValue>WjS1g6YMg1hT7Rp+OpK6deh7pUKTwokv1e21eE3TAk8=</di:DigestValue>
+				<di:DigestValue>BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=</di:DigestValue>
 			</di:Reference>
 		</v2.10.1:Signature>
 	</tns:IEPC>