diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
deleted file mode 100644
index f8583aee47343911adb25f8c6fd64833a16f1227..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml	
+++ /dev/null
@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-4121ae4751874cefa376">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>4x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>28000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>700</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>false</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>7700</Displacement>
-            <RatedSpeed>2200</RatedSpeed>
-            <RatedPower>220000</RatedPower>
-            <MaxEngineTorque>1100</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>700</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
-                <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
-                <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
-                <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
-                <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
-                <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
-                <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
-                <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
-                <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
-                <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
-                <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
-                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>AT 6 Gear</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>APT-S</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>3.364</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>1.909</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>1.421</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>1.000</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>0.720</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>0.615</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 AxleGear</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>6.500</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>false</aux:SmartElectrics>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_nonSmart">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>gi7smqIT9b/iNr6yBm49IkS5ylirBLyHvjZQqlNpzUA=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-d5c4bf1b86394fd7b822">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>/z2B3MvXZr1k8vYmINK/6DLaXPreBcwwmHhHsfDvJRo=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.73851</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1520.18</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">24.94611</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1828.60</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.93598</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1241.44</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.36950</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1493.13</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.03487</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1102.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">18.14589</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1330.13</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
-          <Payload unit="kg">879.90</Payload>
-          <PassengerCount>12.39</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.90679</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">946.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.34621</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1051.61</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.81903</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1599.38</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">26.59833</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1949.71</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.82311</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1306.47</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.69768</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1590.49</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.74932</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1154.46</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.17775</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1405.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
-          <Payload unit="kg">1075.44</Payload>
-          <PassengerCount>15.15</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.19757</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">967.41</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.54412</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1066.11</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
-          <Payload unit="kg">1094.99</Payload>
-          <PassengerCount>15.42</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.13867</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">816.49</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
-          <Payload unit="kg">2737.48</Payload>
-          <PassengerCount>38.56</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.58643</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">849.31</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
-          <Payload unit="kg">1262.82</Payload>
-          <PassengerCount>17.79</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.62230</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">998.54</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
-          <Payload unit="kg">4209.41</Payload>
-          <PassengerCount>59.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.22020</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1115.67</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
-          <Payload unit="kg">1347.01</Payload>
-          <PassengerCount>18.97</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.61807</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">851.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
-          <Payload unit="kg">3367.53</Payload>
-          <PassengerCount>47.43</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.15012</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">890.63</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1975-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-08-06T06:54:52.9756421Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-4121ae4751874cefa376">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <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>YnCPep7uMh3ghMrx6ZsEMLanOijFCZpku+ZDNd6rkLw=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml
deleted file mode 100644
index c702eacfe3fe22f0436e6dd6bd9c083193147c5c..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml	
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-04fd187f166a4d89aa84">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>4x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>700</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>false</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>7700</Displacement>
-            <RatedSpeed>2200</RatedSpeed>
-            <RatedPower>220000</RatedPower>
-            <MaxEngineTorque>1100</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>700</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
-                <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
-                <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
-                <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
-                <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
-                <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
-                <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
-                <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
-                <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
-                <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
-                <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
-                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>AT 6 Gear</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>APT-P</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>1.350</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>1.000</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>0.730</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 AxleGear</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>5.800</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>false</aux:SmartElectrics>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_nonSmart_ATP">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>kHJvKjlgsdqfXPm+aJHs0fEPPIvyfee8L/qYnXiXGIk=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-26e06589d2d34d69b6e8">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>rnrmrt3ib/vuMfdKNkVBq+ozl8ry6fjKxPPixWyNm8E=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.31983</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1636.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">26.95463</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1975.83</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.92708</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1314.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.70502</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1591.02</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.43924</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1131.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">18.60503</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1363.79</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
-          <Payload unit="kg">879.90</Payload>
-          <PassengerCount>12.39</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.13927</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">963.14</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.79162</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1084.26</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">23.49056</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1721.91</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">28.74258</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2106.89</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">18.83855</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1380.91</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">23.12983</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1695.47</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.15304</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1184.05</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.66023</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1441.14</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
-          <Payload unit="kg">1075.44</Payload>
-          <PassengerCount>15.15</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.51319</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">990.55</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.04580</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1102.89</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
-          <Payload unit="kg">1094.99</Payload>
-          <PassengerCount>15.42</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.27604</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">826.56</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
-          <Payload unit="kg">2737.48</Payload>
-          <PassengerCount>38.56</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.75632</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">861.76</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
-          <Payload unit="kg">1262.82</Payload>
-          <PassengerCount>17.79</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.03138</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1028.53</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
-          <Payload unit="kg">4209.41</Payload>
-          <PassengerCount>59.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.76592</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1155.67</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
-          <Payload unit="kg">1347.01</Payload>
-          <PassengerCount>18.97</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.77104</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">862.84</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
-          <Payload unit="kg">3367.53</Payload>
-          <PassengerCount>47.43</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.34058</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">904.59</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1975-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-08-06T07:05:05.6205328Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-04fd187f166a4d89aa84">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <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>y9M45uKl0ouxPZO+eYYCoXEWY2s6S/JlM+Kz8MFVJeg=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml
deleted file mode 100644
index a0940ef3a6788573eb6bc25c3d7f31e3004a7b87..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml	
+++ /dev/null
@@ -1,575 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-584956b9e3ab43acaf97">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model Primary</Model>
-      <VIN>VEH-1234567890_SmartPS</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>6x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>600</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>false</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-        <tcl:Entry gear="12" maxTorque="1900" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
-            <Model>Bus 6x2 Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>12730</Displacement>
-            <RatedSpeed>1800</RatedSpeed>
-            <RatedPower>325032</RatedPower>
-            <MaxEngineTorque>2134</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>600</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
-                <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-                <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-                <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-                <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-                <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-                <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-                <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-                <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-                <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
-            <Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>AMT</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>14.930</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>11.640</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>9.020</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>7.040</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>5.640</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>4.400</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="7">
-                <Ratio>3.390</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="8">
-                <Ratio>2.650</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="9">
-                <Ratio>2.050</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="10">
-                <Ratio>1.600</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="11">
-                <Ratio>1.280</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="12">
-                <Ratio>1.000</Ratio>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>2.590</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>false</aux:SmartElectrics>
-              <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
-              <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>true</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_SmartPS">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1555.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1862.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1227.15</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1483.80</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1051.58</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1290.13</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1665.49</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2049.48</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1312.66</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1630.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1120.08</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1411.95</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
-          <Payload unit="kg">1026.55</Payload>
-          <PassengerCount>14.46</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">866.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
-          <Payload unit="kg">4106.21</Payload>
-          <PassengerCount>57.83</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">976.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
-          <Payload unit="kg">1277.49</Payload>
-          <PassengerCount>17.99</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">639.08</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
-          <Payload unit="kg">3193.72</Payload>
-          <PassengerCount>44.98</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">674.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
-          <Payload unit="kg">1448.40</Payload>
-          <PassengerCount>20.40</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">985.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
-          <Payload unit="kg">5793.60</Payload>
-          <PassengerCount>81.60</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1141.12</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
-          <Payload unit="kg">1853.95</Payload>
-          <PassengerCount>26.11</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">720.51</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
-          <Payload unit="kg">4634.88</Payload>
-          <PassengerCount>65.28</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">774.60</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-05-27T08:16:48.0278823Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-584956b9e3ab43acaf97">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <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>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
deleted file mode 100644
index e24f678131a7411aa05c1a96c3e96a29ab0ce202..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
+++ /dev/null
@@ -1,546 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-65de7efe65ee4b4cac4c">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>4x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>600</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>true</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>true</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-        <tcl:Entry gear="12" maxTorque="1900" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>12730</Displacement>
-            <RatedSpeed>2200</RatedSpeed>
-            <RatedPower>380000</RatedPower>
-            <MaxEngineTorque>2400</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>560</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00" />
-                <Entry engineSpeed="600.00" maxTorque="1282.00" dragTorque="-148.00" />
-                <Entry engineSpeed="800.00" maxTorque="1791.00" dragTorque="-149.00" />
-                <Entry engineSpeed="1000.00" maxTorque="2300.00" dragTorque="-160.00" />
-                <Entry engineSpeed="1200.00" maxTorque="2300.00" dragTorque="-179.00" />
-                <Entry engineSpeed="1400.00" maxTorque="2300.00" dragTorque="-203.00" />
-                <Entry engineSpeed="1600.00" maxTorque="2079.00" dragTorque="-235.00" />
-                <Entry engineSpeed="1800.00" maxTorque="1857.00" dragTorque="-264.00" />
-                <Entry engineSpeed="2000.00" maxTorque="1352.00" dragTorque="-301.00" />
-                <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>NG CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck Gearbox</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>AMT</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>14.930</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>11.640</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>9.020</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>7.040</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>5.640</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>4.400</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="7">
-                <Ratio>3.390</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="8">
-                <Ratio>2.650</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="9">
-                <Ratio>2.050</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="10">
-                <Ratio>1.600</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="11">
-                <Ratio>1.280</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="12">
-                <Ratio>1.000</Ratio>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck AxleGear</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>2.590</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Electrically driven - Electronically controlled</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Full electric steering gear</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>false</aux:SmartElectrics>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_nonSmart">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>4C7sfmETI+wy6CMQq+MZK1MO8SRxRiZu+3rQ3GUfko4=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-bc20a2dbfee54190ae90">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <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>+0Hg3i3G7tHlYHM2JxapJje6Ca3nE5EXZVTNdgkeyMo=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">17.81185</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">998.21</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">21.37501</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1197.89</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">14.37972</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">805.86</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">17.36588</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">973.21</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">12.72559</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">713.16</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">15.58182</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">873.23</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">18.89946</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1059.16</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">22.89746</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1283.21</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">15.23384</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">853.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">18.56793</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1040.58</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">13.41841</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">751.99</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">16.61045</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">930.88</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
-          <Payload unit="kg">879.90</Payload>
-          <PassengerCount>12.39</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">10.88604</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">610.07</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">12.24260</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">686.10</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
-          <Payload unit="kg">1094.99</Payload>
-          <PassengerCount>15.42</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">8.63290</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">483.80</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
-          <Payload unit="kg">2737.48</Payload>
-          <PassengerCount>38.56</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">9.09409</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">509.65</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
-          <Payload unit="kg">1052.35</Payload>
-          <PassengerCount>14.82</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">11.25244</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">630.61</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
-          <Payload unit="kg">4209.41</Payload>
-          <PassengerCount>59.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">12.91147</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">723.58</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
-          <Payload unit="kg">1347.01</Payload>
-          <PassengerCount>18.97</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">9.09497</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">509.70</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
-          <Payload unit="kg">3367.53</Payload>
-          <PassengerCount>47.43</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="NG CI">
-          <EnergyConsumption unit="MJ/km">9.65550</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">541.11</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-05-27T08:24:31.2197913Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-65de7efe65ee4b4cac4c">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <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>MgGDNMXm8x2CI30U7X27ZFWn9cqjTnylZGA0nHA6xtM=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 5962aa99319c9e567d6c125a67e1229b4d8f37c3..5b48698805447eec2e14df44b77d92ba2ec12113 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -4326,9 +4326,6 @@
     <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_AT-P.RSLT_VIF.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_AT-P.RSLT_PIF.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart_AT-P.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -4338,18 +4335,12 @@
     <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.RSLT_VIF.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.RSLT_PIF.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41.RSLT_PIF.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_41_mixed.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -4362,9 +4353,6 @@
     <Content Include="TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>