diff --git a/Documentation/User Manual/5-input-and-output-files/VSUM.md b/Documentation/User Manual/5-input-and-output-files/VSUM.md
index de53da7c3793008fac775f3efbc2b17315dbc6b9..70ef898aa0395be229daf83cf603945dff28a6cb 100644
--- a/Documentation/User Manual/5-input-and-output-files/VSUM.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md	
@@ -58,6 +58,8 @@ The .vsum file includes total / average results for each calculation run in one
 | ΔE_BusAux_Bat                          | [kWh]                                              | In case of smart electrics, the difference of energy stored in the RESS between the beginning and end of the driving cycle. This energy difference is corrected in the post-processing                                                                                                                                      |
 | E_BusAux_PS_corr                       | [kWh]                                              | Mechanical energy of the pneumatic system that needs to be considered in the post-processing to [correct the total fuel consumption](#engine-fuel-consumption-correction)                                                                                                                                                   |
 | E_BusAux_ES_mech_corr                  | [kWh]                                              | Mechanical energy of the electric system that needs to be considered in the post-processing to [correct the total fuel consumption](#engine-fuel-consumption-correction)                                                                                                                                                    |
+| E_BusAux_HVAC_mech                     | [kWh]                                              | Mechancial energy demand of the HVAC system |
+| E_BusAux_HVAC_el                       | [kWh]                                              | Electrical energy demand of the HVAC system |
 | E_BusAux_AuxhHeater                    | [kWh]                                              | Energy demand of an additional aux heater.                                                                                                                                                                                                                                                                                  |
 | E_PTO_CONSUM                           | [kWh]                                              | Total energy demand of the pto consumer (if a pto consumer was used).                                                                                                                                                                                                                                                       |
 | E_PTO_TRANSM                           | [kWh]                                              | Total energy demand of the pto transmission (if a pto transmission was used).                                                                                                                                                                                                                                               |
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index e312866f40ae8ecdd60b7faaaa1b64a8d57259be..3cd17e539b149dec05b428189cb4bcb8df10b61a 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -180,7 +180,9 @@ namespace TUGraz.VectoCore.OutputData
 					Fields.E_AXL_LOSS, Fields.E_BRAKE, Fields.E_VEHICLE_INERTIA, Fields.E_WHEEL, Fields.E_AIR, Fields.E_ROLL, Fields.E_GRAD,
 					Fields.AirConsumed, Fields.AirGenerated, Fields.E_PS_CompressorOff, Fields.E_PS_CompressorOn,
 					Fields.E_BusAux_ES_consumed, Fields.E_BusAux_ES_generated, Fields.Delta_E_BusAux_Battery,
-					Fields.E_BusAux_PS_corr, Fields.E_BusAux_ES_mech_corr, Fields.E_BusAux_AuxHeater,
+					Fields.E_BusAux_PS_corr, Fields.E_BusAux_ES_mech_corr,
+					Fields.E_BusAux_HVAC_Mech, Fields.E_BusAux_HVAC_El,
+					Fields.E_BusAux_AuxHeater,
 					Fields.E_WHR_EL, Fields.E_WHR_MECH, Fields.E_AUX_ESS_MECH, Fields.E_ICE_START, Fields.NUM_ICE_STARTS, Fields.ACC,
 					Fields.ACC_POS, Fields.ACC_NEG, Fields.ACC_TIMESHARE, Fields.DEC_TIMESHARE, Fields.CRUISE_TIMESHARE,
 					Fields.MAX_SPEED, Fields.MAX_ACCELERATION, Fields.MAX_DECELERATION, Fields.AVG_ENGINE_SPEED,
@@ -321,7 +323,7 @@ namespace TUGraz.VectoCore.OutputData
 
 			row[Fields.P_FCMAP_POS] = modData.TotalPowerEnginePositiveAverage().ConvertToKiloWatt();
 
-			WriteAuxiliaries(modData, row);
+			WriteAuxiliaries(modData, row, runData.BusAuxiliaries != null);
 
 			WriteWorkEntries(modData, row, runData);
 
@@ -520,7 +522,7 @@ namespace TUGraz.VectoCore.OutputData
 			return string.Format(col, suffix);
 		}
 
-		private void WriteAuxiliaries(IModalDataContainer modData, DataRow row)
+		private void WriteAuxiliaries(IModalDataContainer modData, DataRow row, bool writeBusAux)
 		{
 			foreach (var aux in modData.Auxiliaries) {
 				string colName;
@@ -539,6 +541,11 @@ namespace TUGraz.VectoCore.OutputData
 
 				row[colName] = modData.AuxiliaryWork(aux.Value).ConvertToKiloWattHour();
 			}
+
+			if (writeBusAux) {
+				row[Fields.E_BusAux_HVAC_Mech] = modData.TimeIntegral<WattSecond>(ModalResultField.P_busAux_HVACmech_consumer).ConvertToKiloWattHour();
+				row[Fields.E_BusAux_HVAC_El] = modData.TimeIntegral<WattSecond>(ModalResultField.P_busAux_ES_HVAC).ConvertToKiloWattHour();
+			}
 		}
 
 		private void WriteGearshiftStats(IModalDataContainer modData, DataRow row, uint gearCount)
@@ -1085,6 +1092,8 @@ namespace TUGraz.VectoCore.OutputData
 			public const string E_BusAux_ES_consumed = "E_BusAux_ES_consumed [kWh]";
 			public const string Delta_E_BusAux_Battery = "ΔE_BusAux_Bat [kWh]";
 
+			public const string E_BusAux_HVAC_Mech = "E_BusAux_HVAC_mech [kWh]";
+			public const string E_BusAux_HVAC_El = "E_BusAux_HVAC_el [kWh]";
 
 			public const string SPECIFIC_FC = "Specific FC [g/kWh] wheel pos.";
 
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index 10f0b03fca42340a04f6979f9ce3a08bdef9e192..2ab7013618781f0239feed80e746fd2a9930caaf 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 10000,
 				refLoad: 4301.748,
-				lowLoad: 860.3496,
+				lowLoad: 860.3496 * 2,
 				axleWeightDistribution: new[] { 0.375, 0.625 }
 			);
 			AssertMission(
@@ -156,7 +156,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 10000,
 				refLoad: 2737.476,
-				lowLoad: 547.4952,
+				lowLoad: 547.4952 * 2,
 				axleWeightDistribution: new[] { 0.375, 0.625 }
 			);
 
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 					height: 3.7,
 					curbMass: 10000,
 					refLoad: 5051.295,
-					lowLoad: 1010.259,
+					lowLoad: 1010.259 * 2,
 					axleWeightDistribution: new[] { 0.375, 0.625 }
 				);
 			AssertMission(
@@ -181,7 +181,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.7,
 				curbMass: 10000,
 				refLoad: 3367.53,
-				lowLoad: 673.506,
+				lowLoad: 673.506 * 2,
 				axleWeightDistribution: new[] { 0.375, 0.625 }
 			);
 
@@ -245,7 +245,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 12000,
 				refLoad: 5018.706,
-				lowLoad: 1003.7412,
+				lowLoad: 1003.7412 * 2,
 				axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
 			);
 			AssertMission(
@@ -257,7 +257,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 12000,
 				refLoad: 3193.722,
-				lowLoad: 638.7444,
+				lowLoad: 638.7444 * 2,
 				axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
 			);
 
@@ -270,7 +270,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 					height: 3.7,
 					curbMass: 12000,
 					refLoad: 6952.32,
-					lowLoad: 1390.464,
+					lowLoad: 1390.464 * 2,
 					axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
 				);
 			AssertMission(
@@ -282,7 +282,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.7,
 				curbMass: 12000,
 				refLoad: 4634.88,
-				lowLoad: 926.976,
+				lowLoad: 926.976 * 2,
 				axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
 			);
 
@@ -346,7 +346,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 12000,
 				refLoad: 6771.27,
-				lowLoad: 1354.254,
+				lowLoad: 1354.254 * 2,
 				axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
 			);
 			AssertMission(
@@ -358,7 +358,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 12000,
 				refLoad: 4308.99,
-				lowLoad: 861.798,
+				lowLoad: 861.798 * 2,
 				axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
 			);
 
@@ -371,7 +371,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 					height: 3.7,
 					curbMass: 12000,
 					refLoad: 9233.55,
-					lowLoad: 1846.71,
+					lowLoad: 1846.71 * 2,
 					axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
 				);
 			AssertMission(
@@ -383,7 +383,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.7,
 				curbMass: 12000,
 				refLoad: 6155.7,
-				lowLoad: 1231.14,
+				lowLoad: 1231.14 * 2,
 				axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
 			);
 
@@ -447,7 +447,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 14000,
 				refLoad: 5496.6780,
-				lowLoad: 1099.3356,
+				lowLoad: 1099.3356 * 2,
 				axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 }
 			);
 			AssertMission(
@@ -459,7 +459,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 14000,
 				refLoad: 3497.886,
-				lowLoad: 699.5772,
+				lowLoad: 699.5772 * 2,
 				axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 }
 			);
 
@@ -472,7 +472,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 					height: 3.7,
 					curbMass: 14000,
 					refLoad: 7495.47,
-					lowLoad: 1499.094,
+					lowLoad: 1499.094 * 2,
 					axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 }
 				);
 			AssertMission(
@@ -484,7 +484,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.7,
 				curbMass: 14000,
 				refLoad: 4996.98,
-				lowLoad: 999.396,
+				lowLoad: 999.396 * 2,
 				axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 }
 			);
 
@@ -548,7 +548,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 14000,
 				refLoad: 7886.538,
-				lowLoad: 1577.3076,
+				lowLoad: 1577.3076 * 2,
 				axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
 			);
 			AssertMission(
@@ -560,7 +560,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.15,
 				curbMass: 14000,
 				refLoad: 5018.706,
-				lowLoad: 1003.7412,
+				lowLoad: 1003.7412 * 2,
 				axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
 			);
 
@@ -573,7 +573,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 					height: 3.7,
 					curbMass: 14000,
 					refLoad: 10754.37,
-					lowLoad: 2150.874,
+					lowLoad: 2150.874 * 2,
 					axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
 				);
 			AssertMission(
@@ -585,7 +585,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				height: 3.7,
 				curbMass: 14000,
 				refLoad: 7169.58,
-				lowLoad: 1433.916,
+				lowLoad: 1433.916 * 2,
 				axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
 			);
 
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
index ef8b9b99fc51f89950143c0fbd22e7439340a828..7879b74caf035751bca53142dbb258a9b95c06b5 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
@@ -223,9 +223,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		 TestCase(Class9Decl, 25, 0, 24.6687),
 		 TestCase(Class9Decl, 25, 1, 24.3307),
 		 TestCase(Class9Decl, 25, 0.5, 24.4997),
-		 TestCase(Class9Decl, 87, -4, 87.6204),
-		 TestCase(Class9Decl, 87, -5, 87.9566),
-		 TestCase(Class9Decl, 87, -4.65, 87.8390)
+		 TestCase(Class9Decl, 87, -4, 87.9234),
+		 TestCase(Class9Decl, 87, -5, 88.2732),
+		 TestCase(Class9Decl, 87, -4.65, 88.15116)
 			]
 		public void TestSimulationPreprocessingVelocityDuringTractionInterruption(string jobFile, double vPre, double grad, double vPost)
 		{
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index bc23c6953a2e21180e0381250b5b0c1d46537e1b..6612868f9d92f1ebbdda142166494cf1a7b2c4a5 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-25-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8291,46.6396,15.8669,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,0.0000,0.0000,7792.4340,167.0777,7792.4340,167.0777,19.9854,,,,186.2516,522.9532,,,,27.2064,37.7900,13.6359,0.2221,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.3147,0.0000,0.0000,1.8487,0.4618,0.0000,5.3307,3.1079,0.3597,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.2095,1796.5316,26.0000,14.3957,5.0038,0.0000,39.9538,0.2852,N/A,0.408863773774677,,,,,NOT CERTIFIED,N/A,0.97524591089198,,,,,,NOT CERTIFIED,N/A,0.859488809846564,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
-#@ SHA256: gnThDdHIFVbIQgi/55RK4Ll5fyD7dVt4CGalytoE5Ww=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+170-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8291,46.6396,15.8669,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,0.0000,0.0000,7792.4340,167.0777,7792.4340,167.0777,19.9854,,,,186.2516,522.9532,,,,27.2064,37.7900,13.6359,0.2221,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.3147,0.0000,0.0000,1.8487,0.4618,0.0000,5.3307,3.1079,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.2095,1796.5316,26.0000,14.3957,5.0038,0.0000,39.9538,0.2852,N/A,0.408863773774677,,,,,NOT CERTIFIED,N/A,0.97524591089198,,,,,,NOT CERTIFIED,N/A,0.859488809846564,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: mzem3WcWeHHsT/YZzxyG/K1+x5TKGxDcSkhhGDG9XhQ=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index d907418d0dbf18b6df795340420ada848a662b8d..479beb1f3bb7ef68c61c64948d443580f5809d03 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-26-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8272,46.6344,15.8669,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,0.0000,0.0000,7969.6084,170.8956,7969.6084,170.8956,20.4421,,,,186.4911,534.9033,,,,27.2016,38.7492,13.9820,0.2060,0.0000,1.9832,0.3799,2.3631,0.0070,0.0000,0.0000,0.3147,0.0000,0.0000,1.8485,0.4461,0.0000,5.3293,3.1075,0.3597,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1121.8867,1796.5316,26.0000,14.3957,5.1578,0.0000,39.9538,0.2805,N/A,0.409921623948621,,,,,NOT CERTIFIED,N/A,0.975246396552834,,,,,,NOT CERTIFIED,N/A,0.859479878569242,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
-#@ SHA256: Mh0WYsjk8QBWeEknnMl2FQdr0UOYaQ1EGX9VPK7lf3w=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+171-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8272,46.6344,15.8669,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,0.0000,0.0000,7969.6084,170.8956,7969.6084,170.8956,20.4421,,,,186.4911,534.9033,,,,27.2016,38.7492,13.9820,0.2060,0.0000,1.9832,0.3799,2.3631,0.0070,0.0000,0.0000,0.3147,0.0000,0.0000,1.8485,0.4461,0.0000,5.3293,3.1075,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1121.8867,1796.5316,26.0000,14.3957,5.1578,0.0000,39.9538,0.2805,N/A,0.409921623948621,,,,,NOT CERTIFIED,N/A,0.975246396552834,,,,,,NOT CERTIFIED,N/A,0.859479878569242,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: EkKaRRIL7DHlWJIJE/Am9ao0RDYPQbdnpldhoESN0JA=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index 1a4fff64cee9091cb4d15e039d93f4beb3d21115..e3a141eb4cb8224199dc7d8279b623f95c700b47 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-21-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,0.0000,0.0000,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,,185.9065,522.0799,,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,0.2677,N/A,0.40846343437036,,,,,NOT CERTIFIED,N/A,0.974391308464304,,,,,,NOT CERTIFIED,N/A,0.857838912545838,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
-#@ SHA256: cbWMvUV4CrVwpWR36cxdn+s0YpqMiv9nXq43jL6EmBw=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+166-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,0.0000,0.0000,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,,185.9065,522.0799,,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,0.2677,N/A,0.40846343437036,,,,,NOT CERTIFIED,N/A,0.974391308464304,,,,,,NOT CERTIFIED,N/A,0.857838912545838,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+#@ SHA256: VOeWsLehPtAX3WGhAE0w9AaF6WdOzlGedeS7WAsZMZg=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
index bdcf7ef4748396e02e0f2265cfc66cce00f703fd..030a82cdc99d6aae2657fa3a4fc19cc3e78f56d3 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
-18-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,379.0000,2.8864,27.4168,0.0036,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,0.0000,0.0000,10195.7876,371.8816,10195.7876,371.8816,44.4834,9.2674,,,172.2255,1163.9895,242.4978,,,40.8256,50.2341,5.2885,0.3358,0.0000,0.4738,0.4738,0.0000,0.0000,5.1676,0.2366,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,952.4879,1538.8058,25.0000,20.0528,0.0000,0.0000,33.7731,0.0000,N/A,0.415386683898571,Standard values,,0.944294049232961,0,NOT CERTIFIED,N/A,0.95440400876431,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
-#@ SHA256: WuZkxrESr4JdhC3YPqiMqHoGeIEwTty6ldwqwEtTwbk=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
+163-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,379.0000,2.8864,27.4168,0.0036,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,0.0000,0.0000,10195.7876,371.8816,10195.7876,371.8816,44.4834,9.2674,,,172.2255,1163.9895,242.4978,,,40.8256,50.2341,5.2885,0.3358,0.0000,0.4738,0.4738,0.0000,0.0000,5.1676,0.2366,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,952.4879,1538.8058,25.0000,20.0528,0.0000,0.0000,33.7731,0.0000,N/A,0.415386683898571,Standard values,,0.944294049232961,0,NOT CERTIFIED,N/A,0.95440400876431,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+#@ SHA256: XAMYw7SOH2BuZzIpTQtUcYQEmj6POn8s8h1L75B22Wc=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
index 514bda5796629b70cedb24d861c9ab8dc5642e02..4ba11190f198d82d547c57f6ed7e21cc7b66c61a 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-19-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,272.0000,1.0234,13.5450,-0.0054,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,0.0000,0.0000,7363.9257,543.6627,7363.9257,543.6627,65.0314,13.5482,,,177.8046,1701.6644,354.5134,,,23.2896,32.9224,2.4875,0.3422,0.0000,0.3400,0.3400,0.0000,0.0000,21.0166,0.3905,0.0000,0.0000,0.0450,0.9481,0.0000,0.0338,0.3587,-0.0001,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.8771,-0.7766,22.4265,25.0000,18.7500,40.6000,1.6935,1.3056,979.1873,1857.4892,45.0000,33.8235,1.4706,0.0000,33.4559,0.5574,N/A,0.376927083000462,Standard values,,0.984236793781103,0,NOT CERTIFIED,N/A,0.843126167087998,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
-#@ SHA256: 7rXNFDAMB6AG9yE3/ynp1A4xozysAVHVLljmiXhJSiI=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+164-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,272.0000,1.0234,13.5450,-0.0054,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,0.0000,0.0000,7363.9257,543.6627,7363.9257,543.6627,65.0314,13.5482,,,177.8046,1701.6644,354.5134,,,23.2896,32.9224,2.4875,0.3422,0.0000,0.3400,0.3400,0.0000,0.0000,21.0166,0.3905,0.0000,0.0000,0.0450,0.9481,0.0000,0.0338,0.3587,-0.0001,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.8771,-0.7766,22.4265,25.0000,18.7500,40.6000,1.6935,1.3056,979.1873,1857.4892,45.0000,33.8235,1.4706,0.0000,33.4559,0.5574,N/A,0.376927083000462,Standard values,,0.984236793781103,0,NOT CERTIFIED,N/A,0.843126167087998,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
+#@ SHA256: MQo66fF78DOvgGEauxpeRPxZBZqx6E3Fn6Mh/q6d5O4=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index d18bfb352154632e75b384a5278d0f602f7f37c4..172e17cdf7abf9bc6377121439ac48df539ffab6 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-20-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,0.0000,0.0000,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,,186.9375,532.4196,,,,27.2199,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,0.2560,N/A,0.410575873210009,,,,,NOT CERTIFIED,N/A,0.974385958482671,,,,,,NOT CERTIFIED,N/A,0.857785140124264,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: jMhQihRi1iy3wa6phDRLwzVBfDPc68o73I0mZy9EPpY=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+165-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,0.0000,0.0000,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,,186.9375,532.4196,,,,27.2199,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,0.2560,N/A,0.410575873210009,,,,,NOT CERTIFIED,N/A,0.974385958482671,,,,,,NOT CERTIFIED,N/A,0.857785140124264,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: 1tRo6L7FtwLxzChzaZLRjkrfIAcn0lDIkk4bASaZpzY=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index 995fb34c34f96a2f9639997d0b7d91fa09d50667..3708ee2786053d455f299c08da2b5f92f47d8689 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-23-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8711,46.7558,15.8669,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,0.0000,0.0000,6299.2293,134.7261,6299.2293,134.7261,16.1156,,,,185.0752,421.6927,,,,20.1036,29.8629,10.7755,0.2881,0.0000,1.9832,1.9832,0.0270,0.0000,0.0000,0.2879,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1085.0944,1962.3354,22.0000,14.3957,1.4627,0.0000,40.1848,0.0000,N/A,0.399686339290224,,,,,NOT CERTIFIED,N/A,0.972090004850644,,,,,,NOT CERTIFIED,N/A,0.83229979692195,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
-#@ SHA256: 44ld7WdJ7EbiLmfimQB0YWXOtNpHkL2c1+513Be5Pj0=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+168-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8711,46.7558,15.8669,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,0.0000,0.0000,6299.2293,134.7261,6299.2293,134.7261,16.1156,,,,185.0752,421.6927,,,,20.1036,29.8629,10.7755,0.2881,0.0000,1.9832,1.9832,0.0270,0.0000,0.0000,0.2879,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1085.0944,1962.3354,22.0000,14.3957,1.4627,0.0000,40.1848,0.0000,N/A,0.399686339290224,,,,,NOT CERTIFIED,N/A,0.972090004850644,,,,,,NOT CERTIFIED,N/A,0.83229979692195,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
+#@ SHA256: GL+lqiO6qv9wwvBhXGLaM9epqEHlJHjcUU0L8XGcPUI=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index 52b3fd858366275acdad1aa19842e75223eb8b44..a2ac3f540527699d3787ac8f26481120705eec51 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-24-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8711,46.7559,15.8669,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,0.0000,0.0000,6457.4048,138.1088,6457.4048,138.1088,16.5202,,,,185.6690,432.2806,,,,20.1038,30.7900,11.1101,0.2750,0.0000,1.9824,0.3775,2.3598,0.0269,0.0000,0.0000,0.2906,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1418,1962.3354,23.0000,14.3957,1.6166,0.0000,40.1848,0.0000,N/A,0.402000564697501,,,,,NOT CERTIFIED,N/A,0.972073707982268,,,,,,NOT CERTIFIED,N/A,0.832297265064537,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: zSb9dANcC7O95Afwo5dkDBtfnMWLGa973L+yhsFFUsI=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+169-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8711,46.7559,15.8669,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,0.0000,0.0000,6457.4048,138.1088,6457.4048,138.1088,16.5202,,,,185.6690,432.2806,,,,20.1038,30.7900,11.1101,0.2750,0.0000,1.9824,0.3775,2.3598,0.0269,0.0000,0.0000,0.2906,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1418,1962.3354,23.0000,14.3957,1.6166,0.0000,40.1848,0.0000,N/A,0.402000564697501,,,,,NOT CERTIFIED,N/A,0.972073707982268,,,,,,NOT CERTIFIED,N/A,0.832297265064537,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: K4m4cAq5Ddq8ABJ8s/cSat8xM8VtiK0FAzDlA1XHWlU=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
index f7a6ec7f18b7276f4991470081f6519aa78c2a5c..6f6c2c33c5d682bd66eb82d6c7d07240399cfcce 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-22-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8351,46.6562,15.8669,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,0.0000,0.0000,7783.1500,166.8192,7783.1500,166.8192,19.9544,,,,185.6254,522.1440,,,,27.1915,37.6385,13.5812,0.1687,0.0000,1.9832,1.9832,0.0067,0.0000,0.0000,0.3210,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.6963,1701.8773,22.0000,14.3957,4.3880,0.0000,39.5689,0.2514,N/A,0.407710308187605,,,,,NOT CERTIFIED,N/A,0.974168745926168,,,,,,NOT CERTIFIED,N/A,0.858764390579578,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
-#@ SHA256: VVvZhPkamTtkosm6wBne9lXNweANW1ZeGbPNJ/z5xl4=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+167-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8351,46.6562,15.8669,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,0.0000,0.0000,7783.1500,166.8192,7783.1500,166.8192,19.9544,,,,185.6254,522.1440,,,,27.1915,37.6385,13.5812,0.1687,0.0000,1.9832,1.9832,0.0067,0.0000,0.0000,0.3210,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.6963,1701.8773,22.0000,14.3957,4.3880,0.0000,39.5689,0.2514,N/A,0.407710308187605,,,,,NOT CERTIFIED,N/A,0.974168745926168,,,,,,NOT CERTIFIED,N/A,0.858764390579578,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
+#@ SHA256: iff/z2St64W7hTtQG7qo6IQhVZNU9aWSLHaZiAAuNzE=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index 3b701d5c8aa9c23c483aa13a28b5ff992fb84a03..77df3180df3b2fb68ee07ac7277a6e1a1589f0c8 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-28-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8420,46.6752,15.8669,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,0.0000,0.0000,6308.6325,135.1604,6308.6325,135.1604,16.1675,,,,184.8872,423.0521,,,,20.1402,29.9124,10.7934,0.3304,0.0000,1.9832,1.9832,0.0082,0.0000,0.0000,0.2780,0.0000,0.0000,1.8453,0.6547,0.0000,2.2238,3.1102,0.3596,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3176,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.6138,1796.5316,26.0000,14.3957,3.0023,0.0000,39.9538,0.3005,N/A,0.399752328298219,,,,,NOT CERTIFIED,N/A,0.973102441420391,,,,,,NOT CERTIFIED,N/A,0.83441619909227,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
-#@ SHA256: LTOU3Oqkx8yEFYcYERdqVI/ojXs3JRYjMjJT0z/Wdd4=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+173-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8420,46.6752,15.8669,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,0.0000,0.0000,6308.6325,135.1604,6308.6325,135.1604,16.1675,,,,184.8872,423.0521,,,,20.1402,29.9124,10.7934,0.3304,0.0000,1.9832,1.9832,0.0082,0.0000,0.0000,0.2780,0.0000,0.0000,1.8453,0.6547,0.0000,2.2238,3.1102,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3176,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.6138,1796.5316,26.0000,14.3957,3.0023,0.0000,39.9538,0.3005,N/A,0.399752328298219,,,,,NOT CERTIFIED,N/A,0.973102441420391,,,,,,NOT CERTIFIED,N/A,0.83441619909227,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
+#@ SHA256: rI9+KYA4eUNsF2dWJLakMeVWvIT6x2BJS91p1qcieeI=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index 11aeb0cddc0d70d3358d55b75de55f769d2d4d39..0b9a300511a03a9a42574a39da4d2f3936867756 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-31-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8410,46.6724,15.8669,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,0.0000,0.0000,6477.6109,138.7889,6477.6109,138.7889,16.6015,,,,184.9917,434.4094,,,,20.1395,30.8444,11.1297,0.3136,0.0000,1.9832,0.3795,2.3627,0.0082,0.0000,0.0000,0.2781,0.0000,0.0000,1.8453,0.6286,0.0000,2.2237,3.1100,0.3596,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3177,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.3974,1796.5316,26.0000,14.3957,3.1563,0.0000,39.9538,0.3014,N/A,0.401454216119916,,,,,NOT CERTIFIED,N/A,0.973103928336166,,,,,,NOT CERTIFIED,N/A,0.834411356629342,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
-#@ SHA256: oqoTXhYq7DFfMKLPngL9Ibt0IvaikpE/9wL6u1TY9S0=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+176-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8410,46.6724,15.8669,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,0.0000,0.0000,6477.6109,138.7889,6477.6109,138.7889,16.6015,,,,184.9917,434.4094,,,,20.1395,30.8444,11.1297,0.3136,0.0000,1.9832,0.3795,2.3627,0.0082,0.0000,0.0000,0.2781,0.0000,0.0000,1.8453,0.6286,0.0000,2.2237,3.1100,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3177,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.3974,1796.5316,26.0000,14.3957,3.1563,0.0000,39.9538,0.3014,N/A,0.401454216119916,,,,,NOT CERTIFIED,N/A,0.973103928336166,,,,,,NOT CERTIFIED,N/A,0.834411356629342,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
+#@ SHA256: 6KO6SifwMdJdVcQXp7p0wkj4X67vCgtgKpERWTkMUSE=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index b9fbc28f19970aa4495a3ab47866b320737fc974..560fd55fa2607ce4d002f3d4386d610602b1dfaf 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-29-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8487,46.6939,15.8669,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,0.0000,0.0000,4881.4833,104.5421,4881.4833,104.5421,12.5050,,,,181.6952,327.2169,,,,13.7599,22.2872,8.0420,0.5117,0.0000,1.9832,1.9832,0.0065,0.0000,0.0000,0.2508,0.0000,0.0000,1.8435,0.8319,0.0000,-0.8568,3.1115,0.3597,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3157,-0.3385,22.9407,21.4011,41.2625,80.5095,1.1306,1.6261,1113.9153,1620.3683,22.0000,14.3957,2.3095,0.0000,40.0308,0.3086,N/A,0.384926976360445,,,,,NOT CERTIFIED,N/A,0.970291794115735,,,,,,NOT CERTIFIED,N/A,0.80392961280151,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,49.9615,20.9392
-#@ SHA256: McVMUK5+lwCIlRKLgx+btkyx5weJyF+YNa+byUwg30I=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+174-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8487,46.6939,15.8669,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,0.0000,0.0000,4881.4833,104.5421,4881.4833,104.5421,12.5050,,,,181.6952,327.2169,,,,13.7599,22.2872,8.0420,0.5117,0.0000,1.9832,1.9832,0.0065,0.0000,0.0000,0.2508,0.0000,0.0000,1.8435,0.8319,0.0000,-0.8568,3.1115,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3157,-0.3385,22.9407,21.4011,41.2625,80.5095,1.1306,1.6261,1113.9153,1620.3683,22.0000,14.3957,2.3095,0.0000,40.0308,0.3086,N/A,0.384926976360445,,,,,NOT CERTIFIED,N/A,0.970291794115735,,,,,,NOT CERTIFIED,N/A,0.80392961280151,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,49.9615,20.9392
+#@ SHA256: Ld8YpU5ALiur1ghP+3F7rt5SJWVbiarc9jV40gOjJlA=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index 52325cb543097a7a8dc8711bd4c458c7037cc453..470a05e8a770da0aaf829c443219be455ca320c2 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-30-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8459,46.6860,15.8669,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,0.0000,0.0000,5476.1124,117.2966,5476.1124,117.2966,14.0307,,,,183.2375,367.1384,,,,16.2812,25.4133,9.1700,0.3995,0.0000,1.9832,1.9832,0.0074,0.0000,0.0000,0.2593,0.0000,0.0000,1.8447,0.6764,0.0000,0.5289,3.1110,0.3597,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3162,-0.3290,23.0177,22.4788,40.1078,80.5095,1.1306,1.6261,1114.7942,1620.7745,22.0000,14.3957,2.6944,0.0000,40.0308,0.3080,N/A,0.391258520914953,,,,,NOT CERTIFIED,N/A,0.971397292125,,,,,,NOT CERTIFIED,N/A,0.817191452320736,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.0385,20.7852
-#@ SHA256: WXmNJD9wiaFzNyMR9GxRL3XFbr5JbCrpHH/BQPBn4ww=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+175-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8459,46.6860,15.8669,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,0.0000,0.0000,5476.1124,117.2966,5476.1124,117.2966,14.0307,,,,183.2375,367.1384,,,,16.2812,25.4133,9.1700,0.3995,0.0000,1.9832,1.9832,0.0074,0.0000,0.0000,0.2593,0.0000,0.0000,1.8447,0.6764,0.0000,0.5289,3.1110,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3162,-0.3290,23.0177,22.4788,40.1078,80.5095,1.1306,1.6261,1114.7942,1620.7745,22.0000,14.3957,2.6944,0.0000,40.0308,0.3080,N/A,0.391258520914953,,,,,NOT CERTIFIED,N/A,0.971397292125,,,,,,NOT CERTIFIED,N/A,0.817191452320736,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.0385,20.7852
+#@ SHA256: tJu+u0yLWK78rEFad5uppu5TRMo+F94jSj/GaBqRNoE=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index 4077e0b836a85d53b06d6ee82cd5b5f6d9bdfb69..180bcd15c00f174426c42981c30fdc819d86011c 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-27-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8465,46.6878,15.8669,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,0.0000,0.0000,5246.2770,112.3693,5246.2770,112.3693,13.4413,,,,182.5394,351.7160,,,,15.2940,24.1937,8.7299,0.4372,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.2561,0.0000,0.0000,1.8442,0.7314,0.0000,0.0000,3.1111,0.3597,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3342,22.9407,21.8630,40.8006,80.5095,1.1306,1.6261,1113.8399,1620.3683,22.0000,14.3957,2.5404,0.0000,40.0308,0.3136,N/A,0.388800058742654,,,,,NOT CERTIFIED,N/A,0.970983969736596,,,,,,NOT CERTIFIED,N/A,0.812654301456777,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,49.9615,20.9392
-#@ SHA256: reI9o3le07/EetdHRHa6T6xYw/cywPn2h6iP4gosAQc=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+172-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8465,46.6878,15.8669,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,0.0000,0.0000,5246.2770,112.3693,5246.2770,112.3693,13.4413,,,,182.5394,351.7160,,,,15.2940,24.1937,8.7299,0.4372,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.2561,0.0000,0.0000,1.8442,0.7314,0.0000,0.0000,3.1111,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3342,22.9407,21.8630,40.8006,80.5095,1.1306,1.6261,1113.8399,1620.3683,22.0000,14.3957,2.5404,0.0000,40.0308,0.3136,N/A,0.388800058742654,,,,,NOT CERTIFIED,N/A,0.970983969736596,,,,,,NOT CERTIFIED,N/A,0.812654301456777,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,49.9615,20.9392
+#@ SHA256: /2XyeyZgTRZ2Tw3QoDLUYjg2WVqQ5tACbOFdbN23YWc=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index c359ce0fe2bbf646661bd3be1ecd5d043d47818e..5ed407c5151caa8767f8a579c7333735916d46de 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-32-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,,,,59.3466,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
-#@ SHA256: Sj4df95OnsFQd/CxRa6bZ03xvki+XWDUJB6RFtEZaB8=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+177-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,,,,59.3466,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
+#@ SHA256: tnZKsE9ZsGZL84+b9oqitlaR+h4ICCUBogh9/f/p9gc=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index e8069a8006e56462f317f91c6859cd8918712c60..f193078a29d93e9ecff85ed05ffad6060972ed8e 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-33-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1566.4000,0.0000,0.0000,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,0.0000,,10013.8397,,10013.8397,,,,,,184.6608,0.0000,,,,41.2262,47.3192,20.5891,0.9829,-0.0004,1.5039,1.5039,0.0169,0.0000,0.0000,0.7227,0.0000,0.0000,1.0764,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1401.0184,2421.2271,52.0000,100.0000,7.1757,0.0000,0.0000,0.0000,N/A,0.398392847549503,,,,,NOT CERTIFIED,N/A,0.968896043991578,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
-#@ SHA256: RA87I+IlHKUglSgXCY4cXRsHCSSXw6UslvgOMAE1xms=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+178-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1566.4000,0.0000,0.0000,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,0.0000,,10013.8397,,10013.8397,,,,,,184.6608,0.0000,,,,41.2262,47.3192,20.5891,0.9829,-0.0004,1.5039,1.5039,0.0169,0.0000,0.0000,0.7227,0.0000,0.0000,1.0764,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1401.0184,2421.2271,52.0000,100.0000,7.1757,0.0000,0.0000,0.0000,N/A,0.398392847549503,,,,,NOT CERTIFIED,N/A,0.968896043991578,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
+#@ SHA256: OVqat7dPuYnkDVHIowcJTYFjg7rrKLIFIvvMA6ognzs=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
index b37c4dda8e8cc3bf4f6ec48b5a4192ba8de817f7..5f9c9396c35b4cb7a6b24d0d3f33da2814ec8b96 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum	
@@ -1,6 +1,6 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
-34-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,0.0000,0.0000,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,8165.4651,,,,,,171.8999,0.0000,,,,0.0000,30.0366,5.7987,0.3501,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1306.6190,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.310130398319601,,,,,,,,,,,,,,,,,
-34-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,0.0000,0.0000,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,8480.9585,,,,,,165.6956,0.0000,,,,0.0000,30.8542,8.6220,0.5488,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1368.7890,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.306721156907804,,,,,,,,,,,,,,,,,
-34-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,0.0000,0.0000,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,6591.7966,,,,,,174.5276,0.0000,,,,0.0000,21.9781,1.0134,0.1282,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1213.8903,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.281100452512794,,,,,,,,,,,,,,,,,
-#@ SHA256: GZK1EuiwcHYMzf7b8ixGysPjQ6lnTrZBnu8XE9H8sKs=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 17:06
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
+206-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,0.0000,0.0000,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,8165.4651,,,,,,171.8999,0.0000,,,,0.0000,30.0366,5.7987,0.3501,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1306.6190,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.310130398319601,,,,,,,,,,,,,,,,,
+206-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,0.0000,0.0000,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,8480.9585,,,,,,165.6956,0.0000,,,,0.0000,30.8542,8.6220,0.5488,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1368.7890,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.306721156907804,,,,,,,,,,,,,,,,,
+206-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,0.0000,0.0000,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,6591.7966,,,,,,174.5276,0.0000,,,,0.0000,21.9781,1.0134,0.1282,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1213.8903,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.281100452512794,,,,,,,,,,,,,,,,,
+#@ SHA256: PmuTIZTuDwAoneynObg30xxSiAv0etXltMN0I4Sz8xA=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
index 20d2eef5a9a8b42d48b001b6f0756d3d5311d4f7..3a827509072794ac8c2482ba53af13dd45e8a68d 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
-0-0,MockJob,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
-#@ SHA256: ZUfpX93MUZW2Rz3kDiTgPyeRJkx6QAakYw5URI14fdQ=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:37
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
+0-0,MockJob,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
+#@ SHA256: frNBN7m4xlwD/9gG55TLkI9sgm+6XZPOj46b2xN6vkc=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
index a95631bcf00e2bedffe68c7ebf524d3e63d23d3e..520904cebb4b52507428c64ddb141388e2361f41 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [k/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
-15-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N/A,-,15700.0000,3300.0000,,19000.0000,N/A,Generic 24t Coach,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2634,no,0.0055,62538.7500,0.0065,52532.5500,0.0055,62538.7500,,,0.00640424928879442,0.00640424928879442,0.5200,1,2,0,N/A,Generic 24t Coach,AMT,6.3800,0.7600,N/A,N/A,N/A,N/A,Secondary Retarder,N/A,N/A,3.5,N/A,Generic 24t Coach,3.2404,,,,,,AMT - EffShift,0,,,,4117.8419,16.8120,14.6978,-43.9640,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,0.0000,0.0000,3746.5757,254.9073,3746.5757,254.9073,30.4913,9.2398,,,161.9798,797.8599,241.7757,,,9.0919,14.2793,16.3333,2.2314,0.0027,0.0000,0.0000,0.0082,0.0000,0.0000,1.0012,1.2154,4.8398,1.4520,1.9638,0.0835,0.2358,5.5710,-2.2714,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0013,0.6173,-0.2686,0.4209,0.3165,99.2140,20.0000,1.3773,0.6427,718.5639,1562.0320,6.0000,0.0486,0.0562,0.0000,0.0321,0.1138,N/A,0.321326537836221,,,,,NOT CERTIFIED,N/A,0.951733558320825,NOT CERTIFIED,N/A,NOT CERTIFIED,N/A,0.776404773677283,NOT CERTIFIED,N/A,0.916823163180487,N/A,NOT CERTIFIED,0.8579,0.0000,0.0000,0.0000,0.0000,0.0572,0.1522,49.8928,49.0399
-#@ SHA256: qkMoW0ciwB5JXZ1SQ0wncpygYjGbHfoYr2P1iKTW7Q0=
+# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 15:40
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
+101-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N/A,-,15700.0000,3300.0000,,19000.0000,N/A,Generic 24t Coach,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2634,no,0.0055,62538.7500,0.0065,52532.5500,0.0055,62538.7500,,,0.00640424928879442,0.00640424928879442,0.5200,1,2,0,N/A,Generic 24t Coach,AMT,6.3800,0.7600,N/A,N/A,N/A,N/A,Secondary Retarder,N/A,N/A,3.5,N/A,Generic 24t Coach,3.2404,,,,,,AMT - EffShift,0,,,,4117.8419,16.8120,14.6978,-43.9640,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,0.0000,0.0000,3746.5757,254.9073,3746.5757,254.9073,30.4913,9.2398,,,161.9798,797.8599,241.7757,,,9.0919,14.2793,16.3333,2.2314,0.0027,0.0000,0.0000,0.0082,0.0000,0.0000,1.0012,1.2154,4.8398,1.4520,1.9638,0.0835,0.2358,5.5710,-2.2714,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0013,0.6173,-0.2686,0.4209,0.3165,99.2140,20.0000,1.3773,0.6427,718.5639,1562.0320,6.0000,0.0486,0.0562,0.0000,0.0321,0.1138,N/A,0.321326539165827,,,,,NOT CERTIFIED,N/A,0.951733558640747,NOT CERTIFIED,N/A,NOT CERTIFIED,N/A,0.776404775129507,NOT CERTIFIED,N/A,0.916823163640295,N/A,NOT CERTIFIED,0.8579,0.0000,0.0000,0.0000,0.0000,0.0572,0.1522,49.8928,49.0399
+#@ SHA256: ItH0BK9lvAEamej+5gNJBgOrgTAPuBlvItN7pDueUUE=
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
index 1a276314e74054384453b4c84afd575220a5c306..d66de6b8d8b6431f70e3481c4381b4259f778df9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
@@ -9,9 +9,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
 		<Date>2017-09-26T15:33:45.0798047Z</Date>
 		<LegislativeClass>N3</LegislativeClass>
 		<VehicleCategory>Tractor</VehicleCategory>
-		<AxleConfiguration>4x2</AxleConfiguration>
-		<CurbMassChassis>8229</CurbMassChassis>
-		<TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
+		<AxleConfiguration>4x2F</AxleConfiguration>
+		<CurbMassChassis>4229</CurbMassChassis>
+		<TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
 		<IdlingSpeed>100</IdlingSpeed>
 		<RetarderType>Transmission Output Retarder</RetarderType>
 		<RetarderRatio>1.000</RetarderRatio>
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index ad5c46453a6eceb083f6c89bb643f11691e6ce01..f946a7ce7998e64f5d944358a50370dbe4c3fe00 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -62,8 +62,8 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(2.700, vehicle.Height.Value());
 			Assert.AreEqual(11.830, vehicle.Length.Value());
 			Assert.AreEqual(2.550, vehicle.Width.Value());
-			Assert.AreEqual(0.120, ((XMLDeclarationCompletedBusDataProviderV26)vehicle).EntranceHeight.Value());
-			Assert.AreEqual("pneumatic", ((XMLDeclarationCompletedBusDataProviderV26)vehicle).DoorDriveTechnology);
+			Assert.AreEqual(0.120, vehicle.EntranceHeight.Value());
+			Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicle.DoorDriveTechnology);
 	
 			var components = inputDataProvider.JobInputData.Vehicle.Components;
 			Assert.IsNotNull(components);
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 2e775ccb16788f15e0861f88f843832ad44dff29..5b9919d94061c64d4ba5938e9cd2316c9f27047f 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -90,7 +90,7 @@ namespace TUGraz.VectoCore.Tests.XML
 		public void CreateRunDataMediumLorry()
 		{
 			var runIdx = 0;
-			var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry.xml";
+			var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry-sample.xml";
 
 			var writer = new FileOutputWriter(jobFile);
 			var inputData = xmlInputReader.CreateDeclaration(jobFile);
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
index 5e1c367e7ed3687a2d57dcb3d194b86d2725c037..7a4538a9887cbf8bd4b0b9139236adc33948138e 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.Tests.XML
 		protected IXMLInputDataReader xmlInputReader;
 		private IKernel _kernel;
 
-		const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml";
+		const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus-sample.xml";
 
 
 		[OneTimeSetUp]