diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml
deleted file mode 100644
index 830031546b7904ec0fe7e960ebc8c6ccb3425567..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:pif="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryBus.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
-	<!-- 
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryBus.xsd"
--->
-	<tns:Data id="PIFHB-VEH-1234567890" xsi:type="pbus:PrimaryVehicleHeavyBusDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1">
-		<Vehicle xsi:type="VehiclePIFType">
-			<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-			<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-			<Model>Generic Model</Model>
-			<VIN>VEH-1234567890</VIN>
-			<Date>2017-02-15T11:00:00Z</Date>
-			<VehicleCategory>Bus</VehicleCategory>
-			<AxleConfiguration>4x2</AxleConfiguration>
-			<Articulated>false</Articulated>
-			<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-			<IdlingSpeed>600</IdlingSpeed>
-			<RetarderType>Transmission Output Retarder</RetarderType>
-			<RetarderRatio>1.000</RetarderRatio>
-			<AngledriveType>None</AngledriveType>
-			<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-			<pbus:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
-				<EngineStopStart>false</EngineStopStart>
-				<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
-				<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
-				<PredictiveCruiseControl>none</PredictiveCruiseControl>
-			</pbus:ADAS>
-			<pbus:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-				<Entry gear="6" maxTorque="1800"/>
-				<Entry gear="1" maxTorque="2500"/>
-				<Entry gear="12" maxTorque="1900"/>
-			</pbus: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>
-							<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
-							<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
-							<v2.3:ElectricalOutput>false</v2.3: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>Diesel CI</FuelType>
-							</Fuels>
-						</Mode>
-					</Data>
-				</Engine>
-				<Transmission>
-					<Data xsi:type="pbus:TransmissionDataPIFType">
-						<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-						<Model>Generic 40t Long Haul Truck Gearbox</Model>
-						<MainCertificationMethod>Standard values</MainCertificationMethod>
-						<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-						<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>
-        <TorqueConverter>
-          <Data xsi:type="TorqueConverterDataPIFType">
-            <Manufacturer>Some Manufacturer</Manufacturer>
-            <Model>Some Model</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>TC CalcApp 123</AppVersion>
-            <Characteristics>
-              <Entry speedRatio="0.0000" torqueRatio="4.50" inputTorqueRef="700.00"/>
-                <Entry speedRatio="0.1000" torqueRatio="3.50" inputTorqueRef="640.00"/>
-                <Entry speedRatio="0.2000" torqueRatio="2.70" inputTorqueRef="560.00"/>
-                <Entry speedRatio="0.3000" torqueRatio="2.20" inputTorqueRef="460.00"/>
-                <Entry speedRatio="0.4000" torqueRatio="1.60" inputTorqueRef="350.00"/>
-                <Entry speedRatio="0.5000" torqueRatio="1.20" inputTorqueRef="250.00"/>
-                <Entry speedRatio="0.6000" torqueRatio="0.90" inputTorqueRef="160.00"/>
-                <Entry speedRatio="0.7400" torqueRatio="0.90" inputTorqueRef="1.00"/>
-                <Entry speedRatio="0.8100" torqueRatio="1.00" inputTorqueRef="-40.34"/>
-                <Entry speedRatio="0.9100" torqueRatio="1.00" inputTorqueRef="-80.34"/>
-                <Entry speedRatio="1.0200" torqueRatio="1.00" inputTorqueRef="-136.11"/>
-                <Entry speedRatio="1.1600" torqueRatio="1.00" inputTorqueRef="-216.52"/>
-                <Entry speedRatio="1.3600" torqueRatio="1.00" inputTorqueRef="-335.19"/>
-                <Entry speedRatio="1.6300" torqueRatio="1.00" inputTorqueRef="-528.77"/>
-                <Entry speedRatio="2.0400" torqueRatio="1.00" inputTorqueRef="-883.40"/>
-                <Entry speedRatio="3.2600" torqueRatio="1.00" inputTorqueRef="-2462.17"/>
-                <Entry speedRatio="8.1500" torqueRatio="1.00" inputTorqueRef="-16540.98"/>             
-            </Characteristics>
-          </Data>
-        </TorqueConverter>
-				<Angledrive>
-					<Data xsi:type="pbus:AngledriveDataPIFType">
-						<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-						<Model>Generic 40t Long Haul Truck Gearbox</Model>
-						<CertificationMethod>Standard values</CertificationMethod>
-						<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-						<Date>2017-01-11T11:00:00Z</Date>
-						<AppVersion>3.0.1</AppVersion>
-						<Ratio>2.345</Ratio>
-					</Data>
-				</Angledrive>
-				<!-- Retarder -->
-				<Axlegear>
-					<Data xsi:type="pbus:AxlegearDataPIFType">
-						<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-						<Model>Generic 40t Long Haul Truck AxleGear</Model>
-						<CertificationMethod>Standard values</CertificationMethod>
-						<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-						<Date>2017-01-11T11:00:00Z</Date>
-						<AppVersion>3.0.1</AppVersion>
-						<LineType>Single portal axle</LineType>
-						<Ratio>2.590</Ratio>
-					</Data>
-				</Axlegear>
-				<AxleWheels xsi:type="v2.0:AxleWheelsComponentDeclarationType">
-					<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-						<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">
-											<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">
-											<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>
-					</v2.0:Data>
-				</AxleWheels>
-				<Auxiliaries>
-					<pbus:Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
-						<Fan>
-							<Technology>Hydraulic driven - Constant displacement pump</Technology>
-						</Fan>
-						<SteeringPump>
-							<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
-						</SteeringPump>
-						<ElectricSystem>
-							<AlternatorTechnology>default</AlternatorTechnology>
-							<SmartElectrics>false</SmartElectrics>
-							<MaxAlternatorPower>10000</MaxAlternatorPower>
-							<ElectricStorageCapacity>800</ElectricStorageCapacity>
-							</ElectricSystem>
-						<PneumaticSystem>
-							<SizeOfAirSupply>Small</SizeOfAirSupply>
-							<Clutch>none</Clutch>
-							<CompressorRatio>1.000</CompressorRatio>
-							<SmartCompressionSystem>false</SmartCompressionSystem>
-							<SmartRegenerationSystem>false</SmartRegenerationSystem>
-							<AirsuspensionControl>mechanically</AirsuspensionControl>
-							<AdBlueDosing>true</AdBlueDosing>
-						</PneumaticSystem>
-						<HVAC>
-							<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
-							<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
-						</HVAC>
-					</pbus:Data>
-				</Auxiliaries>
-			</Components>
-		</Vehicle>
-		<InputDataSignature>
-			<di:Reference URI="#MRF-VEH-1234567890">
-				<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>
-		</InputDataSignature>
-				<ManufacturerRecordSignature>
-			<di:Reference URI="#MRF-VEH-1234567890">
-				<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>
-		</ManufacturerRecordSignature>
-		<Results>
-			<Status>success</Status>
-			<Result status="success">
-				<VehicleGroup>P31SD</VehicleGroup>
-				<Mission>Regional Delivery</Mission>
-				<SimulationParameters>
-					<TotalVehicleMass unit="kg">8810</TotalVehicleMass>
-					<Payload unit="kg">920</Payload>
-					<PassengerCount>20</PassengerCount>
-					<FuelMode>single fuel mode</FuelMode>
-				</SimulationParameters>
-				<Fuel type="Diesel CI">
-					<EnergyConsumption unit="MJ/km">8.99</EnergyConsumption>
-				</Fuel>
-				<CO2 unit="g/km">658.9</CO2>
-			</Result>
-			<Result status="success">
-				<VehicleGroup>P31SD</VehicleGroup>
-				<Mission>Regional Delivery</Mission>
-				<SimulationParameters>
-					<TotalVehicleMass unit="kg">12490</TotalVehicleMass>
-					<Payload unit="kg">4600</Payload>
-					<PassengerCount>80</PassengerCount>
-					<FuelMode>single fuel mode</FuelMode>
-				</SimulationParameters>
-				<Fuel type="Diesel CI">
-					<EnergyConsumption unit="MJ/km">9.88</EnergyConsumption>
-				</Fuel>
-				<CO2 unit="g/km">724.4</CO2>
-			</Result>
-			<Result status="success">
-				<VehicleGroup>P31DD</VehicleGroup>
-				<Mission>Urban Delivery</Mission>
-				<SimulationParameters>
-					<TotalVehicleMass unit="kg">8810</TotalVehicleMass>
-					<Payload unit="kg">920</Payload>
-					<PassengerCount>20</PassengerCount>
-					<FuelMode>single fuel mode</FuelMode>
-				</SimulationParameters>
-				<Fuel type="Diesel CI">
-					<EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
-				</Fuel>
-				<CO2 unit="g/km">763.9</CO2>
-			</Result>
-			<Result status="success">
-				<VehicleGroup>P31DD</VehicleGroup>
-				<Mission>Urban Delivery</Mission>
-				<SimulationParameters>
-					<TotalVehicleMass unit="kg">12490</TotalVehicleMass>
-					<Payload unit="kg">4600</Payload>
-					<PassengerCount>80</PassengerCount>
-					<FuelMode>single fuel mode</FuelMode>
-				</SimulationParameters>
-				<Fuel type="Diesel CI">
-					<EnergyConsumption unit="MJ/km">12.7</EnergyConsumption>
-				</Fuel>
-				<CO2 unit="g/km">927.7</CO2>
-			</Result>
-		</Results>
-		<ApplicationInformation>
-			<SimulationToolVersion>Sample File Generator</SimulationToolVersion>
-			<Date>2017-01-01T00:00:00Z</Date>
-		</ApplicationInformation>
-	</tns:Data>
-	<Signature>
-		<di:Reference URI="#PIFHB-VEH-1234567890">
-			<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>
-</tns:VectoOutputPrimaryVehicle>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/primary_heavyBus group P39_40_nonSmart_ESS.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/primary_heavyBus group P39_40_nonSmart_ESS.RSLT_PIF.xml
deleted file mode 100644
index cc50d569ecb379b87ef5d321ff2788564cfb598d..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/primary_heavyBus group P39_40_nonSmart_ESS.RSLT_PIF.xml	
+++ /dev/null
@@ -1,557 +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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-0e8d75e0db114e998bfe">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart-ESS</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>8x2</AxleConfiguration>
-      <Articulated>true</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>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</Manufacturer>
-            <Model>8x2 articulated bus 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>2600</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>600</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="710.00" dragTorque="-52.00" />
-                <Entry engineSpeed="800.00" maxTorque="989.00" dragTorque="-63.00" />
-                <Entry engineSpeed="1000.00" maxTorque="1265.00" dragTorque="-73.00" />
-                <Entry engineSpeed="1200.00" maxTorque="1420.00" dragTorque="-87.00" />
-                <Entry engineSpeed="1400.00" maxTorque="1420.00" dragTorque="-101.00" />
-                <Entry engineSpeed="1600.00" maxTorque="1420.00" dragTorque="-114.00" />
-                <Entry engineSpeed="1800.00" maxTorque="1329.00" dragTorque="-122.00" />
-                <Entry engineSpeed="2000.00" maxTorque="1227.00" dragTorque="-131.00" />
-                <Entry engineSpeed="2200.00" maxTorque="1129.00" dragTorque="-147.00" />
-                <Entry engineSpeed="2400.00" maxTorque="965.00" dragTorque="-159.00" />
-                <Entry engineSpeed="2500.00" maxTorque="841.00" dragTorque="-165.00" />
-                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-172.00" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>8x2 Bus</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.361</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>1.000</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>0.735</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>8x2 articulated bus</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>5.810</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>VehicleNonDriven</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>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="4" 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: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-ESS">
-        <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>sWZ0EWApOdGewhNtvhvTv6cY2xvTlebXfKktUY1ImKE=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-be52467073904517a4a4">
-        <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>PzyrZ3CfUjQ4kMo8hlesOLtx+cf7vQi1P9AkhSUVPcw=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>error</Status>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
-          <Payload unit="kg">2059.99</Payload>
-          <PassengerCount>30.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">32.32536</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2369.52</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
-          <Payload unit="kg">10299.96</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">41.40581</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">3035.13</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
-          <Payload unit="kg">2059.99</Payload>
-          <PassengerCount>30.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.96457</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1903.26</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
-          <Payload unit="kg">10299.96</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">33.52875</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2457.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
-          <Payload unit="kg">2059.99</Payload>
-          <PassengerCount>30.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.20438</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1627.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
-          <Payload unit="kg">10299.96</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">27.78594</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2036.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
-          <Payload unit="kg">2540.66</Payload>
-          <PassengerCount>37.36</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">38.07156</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2790.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
-          <Payload unit="kg">12703.28</Payload>
-          <PassengerCount>186.81</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">48.56648</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">3560.03</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
-          <Payload unit="kg">2540.66</Payload>
-          <PassengerCount>37.36</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">30.85540</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2261.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
-          <Payload unit="kg">12703.28</Payload>
-          <PassengerCount>186.81</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">40.44459</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2964.67</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
-          <Payload unit="kg">2540.66</Payload>
-          <PassengerCount>37.36</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.98216</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1904.55</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
-          <Payload unit="kg">12703.28</Payload>
-          <PassengerCount>186.81</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">32.20394</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2360.62</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22921.63</TotalVehicleMass>
-          <Payload unit="kg">1971.63</Payload>
-          <PassengerCount>27.77</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.47643</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1427.66</CO2>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">28836.54</TotalVehicleMass>
-          <Payload unit="kg">7886.54</Payload>
-          <PassengerCount>111.08</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>14 (Interurban _P40SD_ReferenceLoad) - absTime: 6965.2064 [s], distance: 54792.1473 [m], dt: 0.6887 [s], v: 0.0135 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
-        <ErrorDetails>String</ErrorDetails>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22957.48</TotalVehicleMass>
-          <Payload unit="kg">2007.48</Payload>
-          <PassengerCount>28.27</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.54248</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1065.99</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">25968.71</TotalVehicleMass>
-          <Payload unit="kg">5018.71</Payload>
-          <PassengerCount>70.69</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.72717</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1152.83</CO2>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27288.59</TotalVehicleMass>
-          <Payload unit="kg">2688.59</Payload>
-          <PassengerCount>37.87</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>17 (Interurban _P40DD_LowLoading) - absTime: 6751.5780 [s], distance: 54389.0000 [m], dt: 1.5134 [s], v: 0.0026 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 25.3849 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.ATGearbox, AbsTime: , SimulationInterval: 1.0000 [s], SimulationDistance: , Acceleration: 0.0000 [m/s^2], OperatingPoint: , EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0026 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 25.3849 [W], AxlegearPowerRequest: 23.7904 [W], WheelsPowerRequest: 23.7904 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 806.1667 [Nm], TorqueConverterOperatingPoint: }</Error>
-        <ErrorDetails>String</ErrorDetails>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">35354.37</TotalVehicleMass>
-          <Payload unit="kg">10754.37</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>18 (Interurban _P40DD_ReferenceLoad) - absTime: 6858.5206 [s], distance: 53825.8936 [m], dt: 0.7387 [s], v: 0.0177 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
-        <ErrorDetails>String</ErrorDetails>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27467.83</TotalVehicleMass>
-          <Payload unit="kg">2867.83</Payload>
-          <PassengerCount>40.39</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>19 (Coach _P40DD_LowLoading) - absTime: 7838.5571 [s], distance: 131329.2866 [m], dt: 1.5811 [s], v: 0.0000 [m/s], Gear: 1 | Infinity [] is not allowed for SI-Values in Vecto.</Error>
-        <ErrorDetails>String</ErrorDetails>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">31769.58</TotalVehicleMass>
-          <Payload unit="kg">7169.58</Payload>
-          <PassengerCount>100.98</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>20 (Coach _P40DD_ReferenceLoad) - absTime: 7535.2269 [s], distance: 130338.3598 [m], dt: 0.6304 [s], v: 0.0141 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
-        <ErrorDetails>String</ErrorDetails>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1952-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-05-06T15:10:54.647039Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-0e8d75e0db114e998bfe">
-      <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>4b33KyfiRLqiIZxFzfTU0l9sRpAP8CYXrX0UrvHb3Vk=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
deleted file mode 100644
index f1722f1a0540b054eab07f62120c0b7c4a74d9c5..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using Ninject;
-using NUnit.Framework;
-using TUGraz.VectoCommon.BusAuxiliaries;
-using TUGraz.VectoCommon.Exceptions;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.InputData.FileIO.XML;
-using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
-using TUGraz.VectoCore.Models.Declaration;
-using TUGraz.VectoCore.InputData.Reader.ComponentData;
-
-namespace TUGraz.VectoCore.Tests.XML
-{
-
-	[TestFixture]
-	class XMLPrimaryVehicleReportBusReaderTest
-	{
-
-		private const string vehilcePIFExample =
-			"TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml";
-
-		private const string vehiclePIFExampleWithErrors =
-				@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\primary_heavyBus group P39_40_nonSmart_ESS.RSLT_PIF.xml"
-			;
-
-		protected IXMLInputDataReader xmlInputReader;
-		private IKernel _kernel;
-
-
-		[OneTimeSetUp]
-		public void RunBeforeAnyTests()
-		{
-			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
-
-			_kernel = new StandardKernel(new VectoNinjectModule());
-			xmlInputReader = _kernel.Get<IXMLInputDataReader>();
-		}
-
-
-		[TestCase]
-		public void TestReadPIFReportWithErrors()
-		{
-			var reader = XmlReader.Create(vehiclePIFExampleWithErrors);
-			var inputDataProvider = xmlInputReader.Create(reader) as IPrimaryVehicleInformationInputDataProvider;
-
-			Assert.AreEqual("error", inputDataProvider.ResultsInputData.Status);
-			Assert.AreEqual(20, inputDataProvider.ResultsInputData.Results.Count);
-
-			Assert.AreEqual("error", inputDataProvider.ResultsInputData.Results[19].ResultStatus);
-		}
-
-
-		[TestCase]
-		public void TestPrimaryVehicleBusData()
-		{
-
-			var reader = XmlReader.Create(vehilcePIFExample);
-			var inputDataProvider = xmlInputReader.Create(reader) as IPrimaryVehicleInformationInputDataProvider;
-
-			var vehicle = inputDataProvider.Vehicle;
-
-			Assert.AreEqual("Generic Truck Manufacturer", vehicle.Manufacturer);
-			Assert.AreEqual("Street, ZIP City", vehicle.ManufacturerAddress);
-			Assert.AreEqual("Generic Model", vehicle.Model);
-			Assert.AreEqual("VEH-1234567890", vehicle.VIN);
-			Assert.AreEqual(DateTime.Parse("2017-02-15T11:00:00Z").ToUniversalTime(), vehicle.Date);
-			Assert.IsTrue(VehicleCategory.HeavyBusPrimaryVehicle == vehicle.VehicleCategory);
-			Assert.IsTrue(AxleConfiguration.AxleConfig_4x2 == vehicle.AxleConfiguration);
-			Assert.AreEqual(false, vehicle.Articulated);
-			Assert.AreEqual(25000, vehicle.GrossVehicleMassRating.Value());
-			Assert.AreEqual(600, vehicle.EngineIdleSpeed.AsRPM);
-			Assert.AreEqual("Transmission Output Retarder", vehicle.Components.RetarderInputData.Type.ToXMLFormat());
-			Assert.AreEqual(1.000, vehicle.Components.RetarderInputData.Ratio);
-			Assert.AreEqual("None", vehicle.Components.AngledriveInputData.Type.ToXMLFormat());
-			Assert.IsFalse(vehicle.ZeroEmissionVehicle);
-
-			Assert.IsFalse(vehicle.ADAS.EngineStopStart);
-			Assert.IsTrue(EcoRollType.None == vehicle.ADAS.EcoRoll);
-			Assert.IsTrue(PredictiveCruiseControlType.None == vehicle.ADAS.PredictiveCruiseControl);
-
-			Assert.IsNotNull(vehicle.TorqueLimits);
-			Assert.AreEqual(3, vehicle.TorqueLimits.Count);
-			Assert.AreEqual(6, vehicle.TorqueLimits[0].Gear);
-			Assert.AreEqual(1800, vehicle.TorqueLimits[0].MaxTorque.Value());
-			Assert.AreEqual(1, vehicle.TorqueLimits[1].Gear);
-			Assert.AreEqual(2500, vehicle.TorqueLimits[1].MaxTorque.Value());
-			Assert.AreEqual(12, vehicle.TorqueLimits[2].Gear);
-			Assert.AreEqual(1900, vehicle.TorqueLimits[2].MaxTorque.Value());
-
-			var components = inputDataProvider.Vehicle.Components;
-
-			TestEngineDataPIFType(components.EngineInputData);
-
-			TestTransmissionDataPIFType(components.GearboxInputData);
-
-			TestTorqueConverterDataPIFType(components.TorqueConverterInputData);
-
-			TestAngledrive(components.AngledriveInputData);
-
-			TestRetarderInputData(components.RetarderInputData);
-
-			TestAxlegear(components.AxleGearInputData);
-
-			TestAxleWheels(components.AxleWheels);
-
-			TestAuxiliaries(components.BusAuxiliaries);
-
-			TestPneumaticSystem(components.BusAuxiliaries.PneumaticSupply,
-				components.BusAuxiliaries.PneumaticConsumers);
-
-			TestHVAC(components.BusAuxiliaries.HVACAux);
-
-			TestResultDataSignature(inputDataProvider.ManufacturerRecordHash);
-
-			TestResultData(inputDataProvider.ResultsInputData);
-
-			TestApplicationInformation(inputDataProvider.ApplicationInformation);
-
-			//TestSignature(inputDataProvider.ManufacturerHash);
-		}
-
-		
-		private void TestEngineDataPIFType(IEngineDeclarationInputData engine)
-		{
-			Assert.IsNotNull(engine);
-			Assert.AreEqual("Generic Engine Manufacturer", engine.Manufacturer);
-			Assert.AreEqual("Generic 40t Long Haul Truck Engine", engine.Model);
-			Assert.AreEqual("e12*0815/8051*2017/05E0000*00", engine.CertificationNumber);
-			Assert.AreEqual(DateTime.Parse("2017-02-15T11:00:00Z").ToUniversalTime(), engine.Date);
-			Assert.AreEqual("VectoEngine x.y", engine.AppVersion);
-			Assert.AreEqual(12730.SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>(), engine.Displacement);//12730
-			Assert.AreEqual(2200, engine.RatedSpeedDeclared.AsRPM);
-			Assert.AreEqual(380000, engine.RatedPowerDeclared.Value());
-			Assert.AreEqual(2400, engine.MaxTorqueDeclared.Value());
-
-			Assert.IsTrue(engine.WHRType == WHRType.None);
-
-			Assert.IsNotNull(engine.EngineModes);
-			Assert.AreEqual(1, engine.EngineModes.Count);
-			Assert.AreEqual(560, engine.EngineModes[0].IdleSpeed.AsRPM);
-
-			var loadCurve = engine.EngineModes[0].FullLoadCurve;
-			Assert.AreEqual(10, loadCurve.Rows.Count);
-			Assert.AreEqual(3, loadCurve.Columns.Count);
-			Assert.AreEqual(FullLoadCurveReader.Fields.EngineSpeed, loadCurve.Columns[0].Caption);
-			Assert.AreEqual(FullLoadCurveReader.Fields.TorqueFullLoad, loadCurve.Columns[1].Caption);
-			Assert.AreEqual(FullLoadCurveReader.Fields.TorqueDrag, loadCurve.Columns[2].Caption);
-
-			var startRow = 0;
-			Assert.IsTrue(CheckLoadCurveEntry("560.00", "1180.00", "-149.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("600.00", "1282.00", "-148.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("800.00", "1791.00", "-149.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("1000.00", "2300.00", "-160.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("1200.00", "2300.00", "-179.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("1400.00", "2300.00", "-203.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("1600.00", "2079.00", "-235.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("1800.00", "1857.00", "-264.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("2000.00", "1352.00", "-301.00", loadCurve, ref startRow));
-			Assert.IsTrue(CheckLoadCurveEntry("2100.00", "1100.00", "-320.00", loadCurve, ref startRow));
-
-			Assert.AreEqual(1, engine.EngineModes[0].Fuels.Count);
-			Assert.AreEqual(FuelType.DieselCI, engine.EngineModes[0].Fuels[0].FuelType);
-		}
-		
-		private void TestTransmissionDataPIFType(IGearboxDeclarationInputData transmission)
-		{
-			Assert.AreEqual("Generic Gearbox Manufacturer", transmission.Manufacturer);
-			Assert.AreEqual("Generic 40t Long Haul Truck Gearbox", transmission.Model);
-			Assert.AreEqual(CertificationMethod.StandardValues, transmission.CertificationMethod);
-			Assert.AreEqual("e12*0815/8051*2017/05E0000*00", transmission.CertificationNumber);
-			Assert.AreEqual(DateTime.Parse("2017-01-11T11:00:00Z").ToUniversalTime(), transmission.Date);
-			Assert.AreEqual("3.0.1", transmission.AppVersion);
-			Assert.AreEqual(GearboxType.AMT, transmission.Type);
-
-			var gears = transmission.Gears;
-			Assert.IsNotNull(gears);
-			Assert.AreEqual(12, gears.Count);
-
-			var currentGearEntry = 0;
-
-			Assert.IsTrue(CheckGearEntry(14.930, 1900, 2000, 1, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(11.640, 1900, 2000, 2, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(9.020, null, 2000, 3, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(7.040, null, 2000, 4, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(5.640, null, 2000, 5, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(4.400, null, 2000, 6, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(3.390, null, 2000, 7, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(2.650, null, 2000, 8, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(2.050, null, 2000, 9, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(1.600, null, 2000, 10, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(1.280, null, 2000, 11, gears, ref currentGearEntry));
-			Assert.IsTrue(CheckGearEntry(1.000, null, null, 12, gears, ref currentGearEntry));
-		}
-
-		private void TestTorqueConverterDataPIFType(ITorqueConverterDeclarationInputData tcData)
-		{
-			Assert.NotNull(tcData);
-			Assert.AreEqual("Some Manufacturer", tcData.Manufacturer);
-			Assert.AreEqual("Some Model", tcData.Model);
-
-			Assert.AreEqual(0, tcData.TCData.Rows[0][TorqueConverterDataReader.Fields.SpeedRatio].ToString().ToDouble());
-			Assert.AreEqual(4.5, tcData.TCData.Rows[0][TorqueConverterDataReader.Fields.TorqueRatio].ToString().ToDouble());
-			Assert.AreEqual(700, tcData.TCData.Rows[0][TorqueConverterDataReader.Fields.CharacteristicTorque].ToString().ToDouble());
-
-			Assert.AreEqual(0.4, tcData.TCData.Rows[4][TorqueConverterDataReader.Fields.SpeedRatio].ToString().ToDouble());
-			Assert.AreEqual(1.6, tcData.TCData.Rows[4][TorqueConverterDataReader.Fields.TorqueRatio].ToString().ToDouble());
-			Assert.AreEqual(350, tcData.TCData.Rows[4][TorqueConverterDataReader.Fields.CharacteristicTorque].ToString().ToDouble());
-
-		}
-
-		private void TestAngledrive(IAngledriveInputData angeldrive)
-		{
-			Assert.IsNotNull(angeldrive);
-			Assert.AreEqual("Generic Gearbox Manufacturer", angeldrive.Manufacturer);
-			Assert.AreEqual("Generic 40t Long Haul Truck Gearbox", angeldrive.Model);
-			Assert.AreEqual(CertificationMethod.StandardValues, angeldrive.CertificationMethod);
-			Assert.AreEqual("e12*0815/8051*2017/05E0000*00", angeldrive.CertificationNumber);
-			Assert.AreEqual(DateTime.Parse("2017-01-11T11:00:00Z").ToUniversalTime(), angeldrive.Date);
-			Assert.AreEqual("3.0.1", angeldrive.AppVersion);
-			Assert.AreEqual(2.345, angeldrive.Ratio);
-
-			Assert.IsNull(angeldrive.LossMap);
-			Assert.That(() => angeldrive.Efficiency, Throws.TypeOf<VectoException>());
-		}
-
-		private void TestRetarderInputData(IRetarderInputData retarder)
-		{
-			Assert.IsNotNull(retarder);
-			Assert.IsNull(retarder.LossMap);
-			Assert.AreEqual("Transmission Output Retarder", retarder.Type.ToXMLFormat());
-			Assert.AreEqual(1.000, retarder.Ratio);
-		}
-		
-		private void TestAxlegear(IAxleGearInputData axelGear)
-		{
-			Assert.AreEqual("Generic Gearbox Manufacturer", axelGear.Manufacturer);
-			Assert.AreEqual("Generic 40t Long Haul Truck AxleGear", axelGear.Model);
-			Assert.AreEqual(CertificationMethod.StandardValues, axelGear.CertificationMethod);
-			Assert.AreEqual("e12*0815/8051*2017/05E0000*00", axelGear.CertificationNumber);
-			Assert.AreEqual(DateTime.Parse("2017-01-11T11:00:00Z").ToUniversalTime(), axelGear.Date);
-			Assert.AreEqual("3.0.1", axelGear.AppVersion);
-			Assert.AreEqual(AxleLineType.SinglePortalAxle, axelGear.LineType);
-			Assert.AreEqual(2.590, axelGear.Ratio);
-
-			Assert.IsNull(axelGear.LossMap);
-			Assert.That(() => axelGear.Efficiency, Throws.TypeOf<VectoException>());
-		}
-
-		private void TestAxleWheels(IAxlesDeclarationInputData axles)
-		{
-			Assert.AreEqual(2, axles.AxlesDeclaration.Count);
-			var axle1 = axles.AxlesDeclaration[0];
-			var axle2 = axles.AxlesDeclaration[1];
-
-			Assert.AreEqual(AxleType.VehicleNonDriven, axle1.AxleType);
-			Assert.AreEqual(false, axle1.TwinTyres);
-			//Data Id ??!?
-
-			var tyre1 = axle1.Tyre;
-			Assert.AreEqual("Generic Wheels Manufacturer", tyre1.Manufacturer);
-			Assert.AreEqual("Generic Wheel", tyre1.Model);
-			Assert.AreEqual("e12*0815/8051*2017/05E0000*00", tyre1.CertificationNumber);
-			Assert.AreEqual(DateTime.Parse("2017-01-11T14:00:00Z").ToUniversalTime(), tyre1.Date);
-			Assert.AreEqual("Tyre Generation App 1.0", tyre1.AppVersion);
-			Assert.AreEqual("315/70 R22.5", tyre1.Dimension);
-			Assert.AreEqual(0.0055, tyre1.RollResistanceCoefficient);
-			Assert.AreEqual(31300, tyre1.TyreTestLoad.Value());//85% of the maximum tyre payload
-
-			Assert.AreEqual("#WHL-5432198760-315-70-R22.5", tyre1.DigestValue.Reference);
-			Assert.AreEqual("urn:vecto:xml:2017:canonicalization", tyre1.DigestValue.CanonicalizationMethods[0]);
-			Assert.AreEqual("http://www.w3.org/2001/10/xml-exc-c14n#", tyre1.DigestValue.CanonicalizationMethods[1]);
-			Assert.AreEqual("http://www.w3.org/2001/04/xmlenc#sha256", tyre1.DigestValue.DigestMethod);
-			Assert.AreEqual("4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=", tyre1.DigestValue.DigestValue);
-
-			var tyre2 = axle2.Tyre;
-			Assert.AreEqual("Generic Wheels Manufacturer", tyre2.Manufacturer);
-			Assert.AreEqual("Generic Wheel", tyre2.Model);
-			Assert.AreEqual("e12*0815/8051*2017/05E0000*00", tyre2.CertificationNumber);
-			Assert.AreEqual(DateTime.Parse("2017-01-11T14:00:00Z").ToUniversalTime(), tyre2.Date);
-			Assert.AreEqual("Tyre Generation App 1.0", tyre2.AppVersion);
-			Assert.AreEqual("315/70 R22.5", tyre2.Dimension);
-			Assert.AreEqual(0.0063, tyre2.RollResistanceCoefficient);
-			Assert.AreEqual(31300, tyre2.TyreTestLoad.Value());
-
-			Assert.AreEqual("#WHL-5432198760-315-70-R22.5", tyre2.DigestValue.Reference);
-			Assert.AreEqual("urn:vecto:xml:2017:canonicalization", tyre2.DigestValue.CanonicalizationMethods[0]);
-			Assert.AreEqual("http://www.w3.org/2001/10/xml-exc-c14n#", tyre2.DigestValue.CanonicalizationMethods[1]);
-			Assert.AreEqual("http://www.w3.org/2001/04/xmlenc#sha256", tyre2.DigestValue.DigestMethod);
-			Assert.AreEqual("KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=", tyre2.DigestValue.DigestValue);
-		}
-
-		private void TestAuxiliaries(IBusAuxiliariesDeclarationData auxiliaries)
-		{
-			Assert.AreEqual("Hydraulic driven - Constant displacement pump", auxiliaries.FanTechnology);
-			Assert.AreEqual(1, auxiliaries.SteeringPumpTechnology.Count);
-			Assert.AreEqual("Variable displacement elec. controlled", auxiliaries.SteeringPumpTechnology[0]);
-			
-			Assert.AreEqual(1, auxiliaries.ElectricSupply.Alternators.Count);
-			//Assert.AreEqual("default", auxiliaries.ElectricSupply.Alternators[0].Technology);
-			Assert.AreEqual(AlternatorType.Smart, auxiliaries.ElectricSupply.AlternatorTechnology);
-		}
-
-		private void TestPneumaticSystem(IPneumaticSupplyDeclarationData supply,
-			IPneumaticConsumersDeclarationData consumers)
-		{
-			Assert.AreEqual("Small", supply.CompressorSize);
-			Assert.AreEqual("none", supply.Clutch);
-			Assert.AreEqual(1.000, supply.Ratio);
-			Assert.AreEqual(false, supply.SmartAirCompression);
-			Assert.AreEqual(false, supply.SmartRegeneration);
-
-			Assert.AreEqual(ConsumerTechnology.Pneumatically, consumers.AdBlueDosing);
-			Assert.AreEqual(ConsumerTechnology.Mechanically, consumers.AirsuspensionControl);
-			//Assert.AreEqual(ConsumerTechnology.Pneumatically, consumers.DoorDriveTechnology);
-		}
-		
-		private void TestHVAC(IHVACBusAuxiliariesDeclarationData hvac)
-		{
-			Assert.AreEqual(true, hvac.AdjustableCoolantThermostat);
-			Assert.AreEqual(true, hvac.EngineWasteGasHeatExchanger);
-		}
-		
-		private void TestResultDataSignature(DigestData resultDataSignature)
-		{
-			Assert.AreEqual("#MRF-VEH-1234567890", resultDataSignature.Reference);
-			Assert.AreEqual("urn:vecto:xml:2017:canonicalization", resultDataSignature.CanonicalizationMethods[0]);
-			Assert.AreEqual("http://www.w3.org/2001/10/xml-exc-c14n#", resultDataSignature.CanonicalizationMethods[1]);
-			Assert.AreEqual("http://www.w3.org/2001/04/xmlenc#sha256", resultDataSignature.DigestMethod);
-			Assert.AreEqual("4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=", resultDataSignature.DigestValue);
-		}
-
-		private void TestResultData(IResultsInputData resultsInputData)
-		{
-			Assert.AreEqual("success", resultsInputData.Status);
-			Assert.AreEqual(4, resultsInputData.Results.Count);
-
-			var result = resultsInputData.Results[0];
-			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual(VehicleClass.ClassP31SD, result.VehicleGroup);
-			Assert.AreEqual(MissionType.RegionalDelivery, result.Mission);
-
-			TestSimulationParameter(8810, 920, 20, "single fuel mode", result.SimulationParameter);
-
-			result = resultsInputData.Results[1];
-			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual(VehicleClass.ClassP31SD, result.VehicleGroup);
-			Assert.AreEqual(MissionType.RegionalDelivery, result.Mission);
-
-			TestSimulationParameter(12490, 4600, 80, "single fuel mode", result.SimulationParameter);
-
-			result = resultsInputData.Results[2];
-			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual(VehicleClass.ClassP31DD, result.VehicleGroup);
-			Assert.AreEqual(MissionType.UrbanDelivery, result.Mission);
-
-			TestSimulationParameter(8810, 920, 20, "single fuel mode", result.SimulationParameter);
-
-			result = resultsInputData.Results[3];
-			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual(VehicleClass.ClassP31DD, result.VehicleGroup);
-			Assert.AreEqual(MissionType.UrbanDelivery, result.Mission);
-
-			TestSimulationParameter(12490, 4600, 80, "single fuel mode", result.SimulationParameter);
-		}
-
-		private void TestApplicationInformation(IApplicationInformation applicationInformation)
-		{
-			Assert.AreEqual("Sample File Generator", applicationInformation.SimulationToolVersion);
-			Assert.AreEqual(DateTime.Parse("2017-01-01T00:00:00Z").ToUniversalTime(), applicationInformation.Date);
-		}
-
-		private void TestSignature(DigestData manufacturerSignature)
-		{
-			Assert.AreEqual("#PIFHB-VEH-1234567890", manufacturerSignature.Reference);
-			Assert.AreEqual("urn:vecto:xml:2017:canonicalization", manufacturerSignature.CanonicalizationMethods[0]);
-			Assert.AreEqual("http://www.w3.org/2001/10/xml-exc-c14n#", manufacturerSignature.CanonicalizationMethods[1]);
-			Assert.AreEqual("http://www.w3.org/2001/04/xmlenc#sha256", manufacturerSignature.DigestMethod);
-			Assert.AreEqual("4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=", manufacturerSignature.DigestValue);
-		}
-
-		private void TestSimulationParameter(double totalVehicleMass, double payload, int passengerCount,
-			string fuelMode, ISimulationParameter simulationParameter)
-		{
-			Assert.AreEqual(totalVehicleMass.SI<Kilogram>(), simulationParameter.TotalVehicleMass);
-			Assert.AreEqual(payload.SI<Kilogram>(), simulationParameter.Payload);
-			Assert.AreEqual(passengerCount, simulationParameter.PassengerCount);
-			Assert.AreEqual(fuelMode, simulationParameter.FuelMode);
-		}
-		
-		private bool CheckLoadCurveEntry(string engineSpeed, string maxTorque, string dragTorque, TableData loadCurve, ref int currentRow)
-		{
-			var result = engineSpeed == loadCurve.Rows[currentRow][0].ToString() &&
-						 maxTorque == loadCurve.Rows[currentRow][1].ToString() &&
-						 dragTorque == loadCurve.Rows[currentRow][2].ToString();
-
-			currentRow++;
-			return result;
-		}
-		
-
-		private bool CheckGearEntry(double? ratio, double? maxTorque, double? maxSpeed, int gearNumber, IList<ITransmissionInputData> gears, ref int currentEntry)
-		{
-			var currentMaxTorque =  maxTorque?.SI<NewtonMeter>();
-			var currentMaxSpeed = maxSpeed?.RPMtoRad();
-
-			var result = gears[currentEntry].Gear == gearNumber &&
-						 gears[currentEntry].Ratio == ratio &&
-						 gears[currentEntry].MaxTorque == currentMaxTorque &&
-						 gears[currentEntry].MaxInputSpeed == currentMaxSpeed;
-			
-			currentEntry++;
-			return result;
-		}
-	}
-}