From aaec245e3ed8e2e28ba1035072b9942e7a26e3bd Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 8 Sep 2022 13:29:02 +0200
Subject: [PATCH] updating expected vsum files

---
 .../TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum     | 8 ++++----
 .../TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum  | 8 ++++----
 .../TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum     | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum    | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum       | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum      | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum   | 8 ++++----
 .../Results/MeasuredSpeedGear_TractionInterruption.vsum   | 8 ++++----
 .../TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum       | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum      | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum     | 8 ++++----
 .../MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum    | 8 ++++----
 .../VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum     | 8 ++++----
 .../TestData/Pwheel/Results/Pwheel_ultimate.vsum          | 8 ++++----
 16 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index b7cb025036..51593d8df8 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-12-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8429,46.6779,15.8669,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,17.6131,,,,198.4411,185.0920,460.8779,,,,24.4129,27.2362,31.9767,32.8306,11.8464,0.3081,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.3147,0.0000,0.0000,1.8501,0.5572,0.0000,5.3389,3.1104,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1125.3166,1796.5316,26.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.402716937557205,,,,,NOT CERTIFIED,N/A,0.975207664829343,,,,,,NOT CERTIFIED,N/A,0.859477814330425,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.1147,20.3233
-#@ SHA256: ZKoldmcvwyTUeD69SltWfgFu/qkVngORFM4MquEhWjw=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+13-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8429,46.6779,15.8669,185.0909,198.4411,,,,,17.6140,147.2526,6873.4454,147.2526,6873.4454,0.0000,0.0000,147.2526,6873.4454,0.0000,0.0000,147.2526,6873.4454,147.2526,6873.4454,147.2526,6873.4454,147.2526,6873.4454,0.0000,0.0000,147.2526,6873.4454,147.2526,6873.4454,147.2526,6873.4454,460.9007,,,,24.4129,27.2362,31.9730,32.8365,11.8485,0.3116,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.3151,1.8501,0.5555,-0.0000,5.3389,3.1104,0.3597,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1126.1077,1796.5316,25.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.4027695649221424,,,NOT CERTIFIED,N/A,0.9752171732172068,,,,,NOT CERTIFIED,N/A,0.8594842954560755,N/A,NOT CERTIFIED,16.7821,7.6982,0.7698,1.0778,4.3880,48.9607,20.3233
+#@ SHA256: yO+eB1OCa8Wg6Md/51w+Q00D0D2a7i3sa4NECPDT+wc=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index b8c4057c34..74d4a1e337 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-4-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8429,46.6779,15.8669,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,17.6131,,,,198.4411,185.0920,460.8779,,,,24.4129,27.2362,31.9767,32.8306,11.8464,0.3081,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.3147,0.0000,0.0000,1.8501,0.5572,0.0000,5.3389,3.1104,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1125.3166,1796.5316,26.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.402716937557205,,,,,NOT CERTIFIED,N/A,0.975207664829343,,,,,,NOT CERTIFIED,N/A,0.859477814330425,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.1147,20.3233
-#@ SHA256: FbRyP2r9OKOp6iazfylB/mcQqejDikBKItQ6NGaihf4=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+10-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8429,46.6779,15.8669,185.0909,198.4411,,,,,17.6140,147.2526,6873.4454,147.2526,6873.4454,0.0000,0.0000,147.2526,6873.4454,0.0000,0.0000,147.2526,6873.4454,147.2526,6873.4454,147.2526,6873.4454,147.2526,6873.4454,0.0000,0.0000,147.2526,6873.4454,147.2526,6873.4454,147.2526,6873.4454,460.9007,,,,24.4129,27.2362,31.9730,32.8365,11.8485,0.3116,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.3151,1.8501,0.5555,-0.0000,5.3389,3.1104,0.3597,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1126.1077,1796.5316,25.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.4027695649221424,,,NOT CERTIFIED,N/A,0.9752171732172068,,,,,NOT CERTIFIED,N/A,0.8594842954560755,N/A,NOT CERTIFIED,16.7821,7.6982,0.7698,1.0778,4.3880,48.9607,20.3233
+#@ SHA256: GiRRyD7w2EUWXZvOR48hW2e5Fq8xvcyeIpmwy5pDq2Q=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index 2a9b040d41..4ca04bf871 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-7-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8707,46.7549,15.8669,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,6868.6451,146.9075,17.5727,,,,200.0441,184.7130,459.8203,,,,24.4708,27.2244,32.0577,32.7847,11.8298,0.2623,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.0000,0.0000,0.3221,0.0000,0.0000,1.8505,0.5444,0.0000,5.3545,3.1155,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,1081.4039,1962.3354,23.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.402415007697477,,,,,NOT CERTIFIED,N/A,0.974346409786707,,,,,,NOT CERTIFIED,N/A,0.857651852112788,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
-#@ SHA256: pW5a/XmdXEjdGj8cl3O8mBe5378IkvRYRQQPHm+LMNk=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+14-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8707,46.7549,15.8669,184.7130,200.0441,,,,,17.5727,146.9075,6868.6451,146.9075,6868.6451,0.0000,0.0000,146.9075,6868.6451,0.0000,0.0000,146.9075,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,6868.6451,0.0000,0.0000,146.9075,6868.6451,146.9075,6868.6451,146.9075,6868.6451,459.8203,,,,24.4708,27.2244,32.0577,32.7847,11.8298,0.2623,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.3221,1.8505,0.5444,-0.0000,5.3545,3.1155,0.3598,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,1081.4039,1962.3354,23.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.40241500769747734,,,NOT CERTIFIED,N/A,0.974346409786707,,,,,NOT CERTIFIED,N/A,0.857651852112788,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+#@ SHA256: cBZl6IkI4WBW+hOEFVzKHR/5SIWkRpaojcEk5fvs4rA=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
index f9ecbaa77f..d31aad948d 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.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-3-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,3.2500,-,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,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,9826.4907,358.4119,42.8722,8.9317,,,184.2977,172.6278,1121.8292,233.7144,,,11.9262,40.8256,44.6299,47.9375,5.0468,0.3482,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.4224,10.4559,0.2655,0.0000,0.0000,0.0944,2.7056,-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,965.0251,1657.1120,25.0000,20.0528,0.0000,0.0000,0.0000,33.7731,0.0000,N/A,0.411293491390796,Standard values,,0.924436642787585,0.653870851596439,NOT CERTIFIED,N/A,0.947609825163379,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
-#@ SHA256: YsvZFQwaZwtLMftjYj7BpxlWNpLY4WhR1di0iFCP4Dk=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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,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 [%]
+7-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,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,-,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,NaN,,0.005903648081995483,0.005903648081995483,0.4700,1,2,0,N/A,AT Serial,APT-P,1.3500,0.7300,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,AT Serial,5.8000,,,,,,,0,,,,379.0000,2.8864,27.4168,0.0036,172.6278,184.2977,,,,8.9317,42.8722,358.4119,9826.4907,358.4119,9826.4907,0.0000,0.0000,358.4119,9826.4907,0.0000,0.0000,358.4119,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,9826.4907,0.0000,0.0000,358.4119,9826.4907,358.4119,9826.4907,358.4119,9826.4907,1121.8292,233.7144,,,11.9262,40.8256,44.6299,47.9375,5.0468,0.3482,0.0000,0.0000,0.0000,0.0000,0.0000,0.4224,10.4559,0.2655,0.0944,2.7056,-0.0001,0.2436,1.0118,0.0002,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,965.0251,1657.1120,25.0000,20.0528,0.0000,0.0000,0.0000,33.7731,0.0000,N/A,0.4112934913907961,Standard values,,0.9244366427875851,0.6538708515964385,NOT CERTIFIED,N/A,0.9476098251633791,,,,,NOT CERTIFIED,N/A,0.9800000000000008,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+#@ SHA256: gXgQsqoBz9Qs1Sh6JqJRlco29CRUUj/gRVk8Suy8Qno=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
index 8078bdc579..26fe420f71 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.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-8-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,3.2500,-,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.0228,13.5366,-0.0054,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,6837.3747,505.1016,60.4189,12.5873,,,230.0695,180.5777,1580.9681,329.3684,,,5.1887,22.5565,25.2957,29.3232,2.2155,0.3043,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0756,23.4571,0.4075,0.0000,0.0000,0.0418,1.0056,0.0000,0.0337,0.3585,-0.0001,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.7880,-0.8016,23.8971,23.1618,19.1176,40.6000,1.7751,1.3056,982.5183,1857.4892,45.0000,33.8235,1.1029,0.0000,0.0000,33.8235,0.9202,N/A,0.361573501631451,Standard values,,0.969380030000224,0.835439021277848,NOT CERTIFIED,N/A,0.830056311252242,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.4559,14.3382,13.6029,5.1471,0.0000
-#@ SHA256: kiC27IHIHHcqSSg9sr56Tp1vYTnDoglV7MTRV1CGY3s=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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,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 [%]
+2-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,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,-,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,NaN,,0.005903648081995483,0.005903648081995483,0.4700,1,2,0,N/A,AT Serial,APT-S,3.4000,0.6200,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,AT Serial,6.2000,,,,,,,0,,,,272.0000,1.0228,13.5366,-0.0054,180.5777,230.0695,,,,12.5873,60.4189,505.1016,6837.3747,505.1016,6837.3747,0.0000,0.0000,505.1016,6837.3747,0.0000,0.0000,505.1016,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,6837.3747,0.0000,0.0000,505.1016,6837.3747,505.1016,6837.3747,505.1016,6837.3747,1580.9681,329.3684,,,5.1887,22.5565,25.2957,29.3232,2.2155,0.3043,0.0000,0.0000,0.0000,0.0000,0.0000,0.0756,23.4571,0.4075,0.0418,1.0056,-0.0000,0.0337,0.3585,-0.0001,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.7880,-0.8016,23.8971,23.1618,19.1176,40.6000,1.7751,1.3056,982.5183,1857.4892,45.0000,33.8235,1.1029,0.0000,0.0000,33.8235,0.9202,N/A,0.3615735016314505,Standard values,,0.9693800300002241,0.835439021277848,NOT CERTIFIED,N/A,0.8300563112522418,,,,,NOT CERTIFIED,N/A,0.9799999999999992,N/A,NOT CERTIFIED,33.8235,24.6324,8.4559,14.3382,13.6029,5.1471,0.0000
+#@ SHA256: XtYGJ2tpGPbyctAmwfd4GRmHPIiTljqV6Crh/ufjzxQ=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index a3b50a8bf5..d1eefdb770 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-9-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8707,46.7549,15.8669,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,6849.5199,146.4984,17.5237,,,,200.2748,185.4878,458.5400,,,,24.4708,27.2244,32.0543,32.7790,11.8277,0.2615,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.0000,0.0000,0.3270,0.0000,0.0000,1.8505,0.5382,0.0000,5.3545,3.1155,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.0925,1962.3354,24.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.403468674824705,,,,,NOT CERTIFIED,N/A,0.974323538757316,,,,,,NOT CERTIFIED,N/A,0.85764277102288,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: Pg91MSVSQjNOI4r8Q5Kgq0/tTHt/jYNUwSxL+DSSN60=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+3-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8707,46.7549,15.8669,185.4878,200.2748,,,,,17.5237,146.4984,6849.5199,146.4984,6849.5199,0.0000,0.0000,146.4984,6849.5199,0.0000,0.0000,146.4984,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,6849.5199,0.0000,0.0000,146.4984,6849.5199,146.4984,6849.5199,146.4984,6849.5199,458.5400,,,,24.4708,27.2244,32.0543,32.7790,11.8277,0.2615,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.3270,1.8505,0.5382,-0.0000,5.3545,3.1155,0.3598,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.0925,1962.3354,24.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.4034686748247051,,,NOT CERTIFIED,N/A,0.9743235387573156,,,,,NOT CERTIFIED,N/A,0.85764277102288,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: YtG6h3RRotu01FbJkwMGzE20jNEErBbCbuGtaL85BvY=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index 9ecc0169f9..7c723c09fe 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-10-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8716,46.7572,15.8669,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,5421.5698,115.9515,13.8698,,,,199.9311,183.0610,362.9283,,,,15.7991,20.1042,24.0307,25.0986,9.0564,0.3853,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0271,0.0000,0.0000,0.2874,0.0000,0.0000,1.8468,0.8111,0.0000,2.2253,3.1157,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,1084.4163,1962.3354,22.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.390300589207987,,,,,NOT CERTIFIED,N/A,0.971965009332477,,,,,,NOT CERTIFIED,N/A,0.832084244014295,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
-#@ SHA256: zo56jdAGH7bzigmsKKq4J8L34zWSXvEN/ue9RNoPmic=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+12-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8716,46.7572,15.8669,183.0610,199.9311,,,,,13.8698,115.9515,5421.5698,115.9515,5421.5698,0.0000,0.0000,115.9515,5421.5698,0.0000,0.0000,115.9515,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,5421.5698,0.0000,0.0000,115.9515,5421.5698,115.9515,5421.5698,115.9515,5421.5698,362.9283,,,,15.7991,20.1042,24.0307,25.0986,9.0564,0.3853,0.0000,0.0000,0.0000,0.0000,0.0000,0.0271,0.2874,1.8468,0.8111,-0.0000,2.2253,3.1157,0.3598,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,1084.4163,1962.3354,22.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.39030058920798716,,,NOT CERTIFIED,N/A,0.9719650093324774,,,,,NOT CERTIFIED,N/A,0.8320842440142951,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
+#@ SHA256: CRSgVz++J1i/U08xWDX2RSjESTwWt+j2fy0R1TBJfVY=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index 44abb0e29d..3b028fdba3 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-2-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8716,46.7572,15.8669,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,5409.4966,115.6933,13.8389,,,,200.7881,183.5366,362.1201,,,,15.7991,20.1042,24.0258,25.0944,9.0549,0.3856,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0269,0.0000,0.0000,0.2892,0.0000,0.0000,1.8468,0.8077,0.0000,2.2253,3.1157,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.1704,1962.3354,23.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.391106379442543,,,,,NOT CERTIFIED,N/A,0.971936192761897,,,,,,NOT CERTIFIED,N/A,0.832084244014295,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: hMajHQAXca1koITz3IPdVYXHF1oorUJt74ymWwVuDEg=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+4-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8716,46.7572,15.8669,183.5366,200.7881,,,,,13.8389,115.6933,5409.4966,115.6933,5409.4966,0.0000,0.0000,115.6933,5409.4966,0.0000,0.0000,115.6933,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,5409.4966,0.0000,0.0000,115.6933,5409.4966,115.6933,5409.4966,115.6933,5409.4966,362.1201,,,,15.7991,20.1042,24.0258,25.0944,9.0549,0.3856,0.0000,0.0000,0.0000,0.0000,0.0000,0.0269,0.2892,1.8468,0.8077,-0.0000,2.2253,3.1157,0.3598,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.1704,1962.3354,23.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.3911063794425426,,,NOT CERTIFIED,N/A,0.9719361927618968,,,,,NOT CERTIFIED,N/A,0.8320842440142951,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: ufeGPBb83TXOEl5omM2DMI0/96JT4sWxpU7DX5sYfyA=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
index c63f6f899a..1d6ef5b69b 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.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-6-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8386,46.6659,15.8669,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,6849.7433,146.7826,17.5577,,,,199.3799,184.3349,459.4296,,,,24.4142,27.1997,31.9532,32.7170,11.8054,0.2756,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.0000,0.0000,0.3229,0.0000,0.0000,1.8481,0.5672,0.0000,5.3401,3.1096,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3201,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.9377,1701.8773,22.0000,14.3957,3.1563,0.0000,0.0000,39.5689,0.2450,N/A,0.402692750162188,,,,,NOT CERTIFIED,N/A,0.974012575676176,,,,,,NOT CERTIFIED,N/A,0.858794922444015,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
-#@ SHA256: eqKpvxyzfOrieT968SXYj9/Ox+FMas2rKR1/MT1Q8es=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+6-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8386,46.6659,15.8669,184.3349,199.3799,,,,,17.5577,146.7826,6849.7433,146.7826,6849.7433,0.0000,0.0000,146.7826,6849.7433,0.0000,0.0000,146.7826,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,6849.7433,0.0000,0.0000,146.7826,6849.7433,146.7826,6849.7433,146.7826,6849.7433,459.4296,,,,24.4142,27.1997,31.9532,32.7170,11.8054,0.2756,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.3229,1.8481,0.5672,-0.0000,5.3401,3.1096,0.3598,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3201,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.9377,1701.8773,22.0000,14.3957,3.1563,0.0000,0.0000,39.5689,0.2450,N/A,0.402692750162188,,,NOT CERTIFIED,N/A,0.9740125756761759,,,,,NOT CERTIFIED,N/A,0.858794922444015,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
+#@ SHA256: Iza75Qn2C8t/EaOiF45Zi6l/MzZ0MAhvdEP7SzNKyPQ=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index d9553ebcdb..35580d7eab 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-5-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8508,46.6998,15.8669,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,13.9097,,,,198.2396,183.1780,363.9729,,,,15.7837,20.1449,23.9428,25.1533,9.0761,0.4368,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.0000,0.0000,0.2775,0.0000,0.0000,1.8463,0.8116,0.0000,2.2240,3.1119,0.3594,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1120.4152,1796.5316,26.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.390507866135044,,,,,NOT CERTIFIED,N/A,0.973052763802168,,,,,,NOT CERTIFIED,N/A,0.83430658481887,N/A,NOT CERTIFIED,16.5512,7.8522,0.7698,1.0778,3.4642,49.6536,20.6313
-#@ SHA256: PhrlgkHtOwMugCcL+DdxvACu4kkDq6joFJvCtUu+QDU=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+9-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8508,46.6998,15.8669,183.1732,198.2396,,,,,13.9106,116.2926,5430.8369,116.2926,5430.8369,0.0000,0.0000,116.2926,5430.8369,0.0000,0.0000,116.2926,5430.8369,116.2926,5430.8369,116.2926,5430.8369,116.2926,5430.8369,0.0000,0.0000,116.2926,5430.8369,116.2926,5430.8369,116.2926,5430.8369,363.9958,,,,15.7837,20.1449,23.9391,25.1592,9.0783,0.4403,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.2779,1.8463,0.8099,-0.0000,2.2240,3.1119,0.3594,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1121.2063,1796.5316,25.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.39057524027136126,,,NOT CERTIFIED,N/A,0.9730651656859475,,,,,NOT CERTIFIED,N/A,0.8343148411447829,N/A,NOT CERTIFIED,16.4742,7.8522,0.7698,1.0778,3.6952,49.4996,20.6313
+#@ SHA256: HaA6PxqLuvpxBNBY+fcKCZa3JS/WFIBvcL0A9xHWL6Y=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index fea129671f..3b339d75d1 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-15-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8508,46.6998,15.8669,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,13.9097,,,,198.2396,183.1780,363.9729,,,,15.7837,20.1449,23.9428,25.1533,9.0761,0.4368,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.0000,0.0000,0.2775,0.0000,0.0000,1.8463,0.8116,0.0000,2.2240,3.1119,0.3594,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1120.4152,1796.5316,26.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.390507866135044,,,,,NOT CERTIFIED,N/A,0.973052763802168,,,,,,NOT CERTIFIED,N/A,0.83430658481887,N/A,NOT CERTIFIED,16.5512,7.8522,0.7698,1.0778,3.4642,49.6536,20.6313
-#@ SHA256: 8htFboMkMT2622i5eXzZ/RAZZAr2uPdLMhKryPwfjd8=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+1-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8508,46.6998,15.8669,183.1732,198.2396,,,,,13.9106,116.2926,5430.8369,116.2926,5430.8369,0.0000,0.0000,116.2926,5430.8369,0.0000,0.0000,116.2926,5430.8369,116.2926,5430.8369,116.2926,5430.8369,116.2926,5430.8369,0.0000,0.0000,116.2926,5430.8369,116.2926,5430.8369,116.2926,5430.8369,363.9958,,,,15.7837,20.1449,23.9391,25.1592,9.0783,0.4403,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.2779,1.8463,0.8099,-0.0000,2.2240,3.1119,0.3594,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1121.2063,1796.5316,25.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.39057524027136126,,,NOT CERTIFIED,N/A,0.9730651656859475,,,,,NOT CERTIFIED,N/A,0.8343148411447829,N/A,NOT CERTIFIED,16.4742,7.8522,0.7698,1.0778,3.6952,49.4996,20.6313
+#@ SHA256: r1hT+K8Jzkj3x7Dz1janvyCPAJkH/zMilX20sUflKjU=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index a3752767ae..80a869ece8 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-13-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8561,46.7143,15.8669,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,4056.5443,86.8374,10.3872,,,,195.2592,179.7775,271.8010,,,,7.2483,13.7626,16.0203,18.0164,6.5009,0.7203,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.0000,0.0000,0.2500,0.0000,0.0000,1.8443,1.0643,0.0000,-0.8571,3.1128,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3385,22.8637,21.4011,41.3395,80.5095,1.1306,1.6261,1116.4414,1620.3683,22.0000,14.3957,1.5396,0.0000,0.0000,40.0308,0.3144,N/A,0.374442969418009,,,,,NOT CERTIFIED,N/A,0.970216684820176,,,,,,NOT CERTIFIED,N/A,0.80379124532862,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,50.0385,20.8622
-#@ SHA256: fsvkbfBPrzC7xzAI8qsH/lQDN5T1EhygVF8+qAB4r90=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+11-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8561,46.7143,15.8669,179.7673,195.2592,,,,,10.3881,86.8447,4056.8855,86.8447,4056.8855,0.0000,0.0000,86.8447,4056.8855,0.0000,0.0000,86.8447,4056.8855,86.8447,4056.8855,86.8447,4056.8855,86.8447,4056.8855,0.0000,0.0000,86.8447,4056.8855,86.8447,4056.8855,86.8447,4056.8855,271.8239,,,,7.2483,13.7626,16.0165,18.0223,6.5030,0.7237,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.2503,1.8443,1.0626,-0.0000,-0.8571,3.1128,0.3597,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3385,22.8637,21.4011,41.3395,80.5095,1.1306,1.6261,1117.2325,1620.3683,21.0000,14.3957,1.5396,0.0000,0.0000,40.0308,0.3144,N/A,0.3745345126629928,,,NOT CERTIFIED,N/A,0.970234030768998,,,,,NOT CERTIFIED,N/A,0.8038024612443251,N/A,NOT CERTIFIED,16.5512,7.6212,0.7698,1.0778,3.2333,49.8845,20.8622
+#@ SHA256: p37uY9/bnVdCFqtvL7WGanjTamsnCtJSdUASUFOHKKs=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index c4a14bca13..4b6c8d058b 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-14-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8544,46.7098,15.8669,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,4629.3148,99.1081,11.8550,,,,196.0719,180.9230,310.2083,,,,11.0892,16.2864,19.3366,20.8721,7.5314,0.5541,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0076,0.0000,0.0000,0.2588,0.0000,0.0000,1.8455,0.8641,0.0000,0.5292,3.1125,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3171,-0.3290,22.9407,22.4788,40.1848,80.5095,1.1306,1.6261,1117.4258,1620.7745,22.0000,14.3957,1.7706,0.0000,0.0000,40.0308,0.3096,N/A,0.380123796451876,,,,,NOT CERTIFIED,N/A,0.971334244105636,,,,,,NOT CERTIFIED,N/A,0.817092169463241,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.1155,20.7082
-#@ SHA256: qoUaWE4BpskT+xf5WImM6TS51e9pk+cf9WVjo5q7Jqk=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+5-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8544,46.7098,15.8669,180.9143,196.0719,,,,,11.8559,99.1154,4629.6560,99.1154,4629.6560,0.0000,0.0000,99.1154,4629.6560,0.0000,0.0000,99.1154,4629.6560,99.1154,4629.6560,99.1154,4629.6560,99.1154,4629.6560,0.0000,0.0000,99.1154,4629.6560,99.1154,4629.6560,99.1154,4629.6560,310.2311,,,,11.0892,16.2864,19.3329,20.8781,7.5335,0.5576,-0.0000,0.0000,0.0000,0.0000,0.0000,0.0076,0.2591,1.8455,0.8624,-0.0000,0.5292,3.1125,0.3597,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3171,-0.3290,22.9407,22.4788,40.1848,80.5095,1.1306,1.6261,1118.2169,1620.7745,21.0000,14.3957,1.7706,0.0000,0.0000,40.0308,0.3096,N/A,0.38020359541529886,,,NOT CERTIFIED,N/A,0.971349193435805,,,,,NOT CERTIFIED,N/A,0.8171019643073341,N/A,NOT CERTIFIED,16.4742,7.6982,0.7698,1.0778,3.3102,49.9615,20.7082
+#@ SHA256: s7vyiXSJr6k6XJel4GMxcK2KFflOghxhsnaMKMuWEck=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index 5193adfb73..ddd91d3abc 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-11-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,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.8547,46.7104,15.8669,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,4407.8963,94.3664,11.2878,,,,195.5454,180.4273,295.3668,,,,9.6229,15.2982,18.0566,19.7503,7.1266,0.6112,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.2554,0.0000,0.0000,1.8450,0.9355,0.0000,0.0000,3.1126,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3175,-0.3342,22.8637,21.8630,40.8776,80.5095,1.1306,1.6261,1116.4342,1620.3683,22.0000,14.3957,1.6936,0.0000,0.0000,40.0308,0.3109,N/A,0.377761274946201,,,,,NOT CERTIFIED,N/A,0.970918314733561,,,,,,NOT CERTIFIED,N/A,0.812538775721098,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,50.0385,20.8622
-#@ SHA256: 4nLR8LcDDiQvXq28FKgGbMy1Gg5IE6G00dk/Zp6fBP8=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:19
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+8-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,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,-,0.007144311,20800.0000,0.008081271,20800.0000,NaN,,NaN,,0.007649953949181687,0.007649953949181687,0.5200,1,1,0,N/A,Demo,SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8547,46.7104,15.8669,180.4180,195.5454,,,,,11.2887,94.3737,4408.2376,94.3737,4408.2376,0.0000,0.0000,94.3737,4408.2376,0.0000,0.0000,94.3737,4408.2376,94.3737,4408.2376,94.3737,4408.2376,94.3737,4408.2376,0.0000,0.0000,94.3737,4408.2376,94.3737,4408.2376,94.3737,4408.2376,295.3897,,,,9.6229,15.2982,18.0529,19.7562,7.1287,0.6146,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.2557,1.8450,0.9338,-0.0000,0.0000,3.1126,0.3597,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3175,-0.3342,22.8637,21.8630,40.8776,80.5095,1.1306,1.6261,1117.2253,1620.3683,21.0000,14.3957,1.6936,0.0000,0.0000,40.0308,0.3109,N/A,0.3778452649791556,,,NOT CERTIFIED,N/A,0.9709341218093056,,,,,NOT CERTIFIED,N/A,0.8125490871045372,N/A,NOT CERTIFIED,16.4742,7.6982,0.7698,1.0778,3.2333,49.8845,20.8622
+#@ SHA256: 1NaSRq4ET4E0f6/NDboJedm3Vnvfh6Itxomvi74Rczw=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index 88cd687d94..93414ca0ba 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:09
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-1-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,4.1500,-,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,,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,0.0000,,,,59.3466,59.3466,62.3778,62.3778,0.0260,0.0000,0.0000,0.0000,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,33.3333,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: JolEN7GixKm8X2tvundHORUgq4lHTeV3URMYofCi64E=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:18
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+1-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,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,-,0.0061,20846.0000,0.0061,19679.0000,NaN,,NaN,,0.006113956390620198,0.006113956390620198,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1.5000,0.0000,0.0000,,0.0000,0.0000,,,,,,,12705.4509,,12705.4509,,0.0000,,12705.4509,,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,12705.4509,0.0000,,,,59.3466,59.3466,62.3778,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0006,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,33.3333,0.0000,0.0000,0.0000,N/A,0.41391835076499384,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,NOT CERTIFIED,N/A,,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
+#@ SHA256: LYSII4XjeQmu8Defi1JIv6taL//vntlMogx8ge+FvtA=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index 18f381e33d..771fbcb6aa 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.7.6.2507-DEV - 15.11.2021 09:09
-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,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],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-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_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],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [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_ice_start [kWh],E_aux_ESS_missing [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 [%],ICE max. Load time share [%],ICE off 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 [%]
-2-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,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,4.1500,-,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,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,0.0000,,9528.3843,,9528.3843,,,,,,192.4816,184.2535,0.0000,,,,34.0136,41.2262,42.3421,44.8506,19.5150,1.0915,-0.0004,0.0000,0.0000,0.0000,0.0000,0.0000,0.0042,0.0000,0.0000,0.7099,0.0000,0.0000,1.0740,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,1400.6978,2293.0401,52.0000,100.0000,4.5965,0.0000,0.0000,0.0000,0.0000,N/A,0.39684760824751,,,,,NOT CERTIFIED,N/A,0.968864499507214,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
-#@ SHA256: lBUn13V3ofOtBBQiuf+xl1rs/We6WWUHz6C2G91st1w=
+# VECTO-DEV 0.7.9.2807-DEV - 08.09.2022 13:18
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],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,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],k_engline [g/kWh],k_vehline [g/kWh],Specific FC [g/kWh] wheel pos.,FC-Final [l/100Pkm],FC-Final [l/100m³km],FC-Final [l/100tkm],FC-Final [l/100km],FC-Final [g/km],FC-Final [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater [g/h],FC-SoC_Corr [g/km],FC-SoC_Corr [g/h],FC-SoC [g/km],FC-SoC [g/h],FC-WHR_Corr [g/km],FC-WHR_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-ESS_Corr [g/km],FC-ESS_Corr [g/h],FC-ESS [g/km],FC-ESS [g/h],FC-WHTCc [g/km],FC-WHTCc [g/h],FC-NCVc [g/km],FC-NCVc [g/h],FC-Map [g/km],FC-Map [g/h],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,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 [%]
+2-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,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,-,0.0061,20846.0000,0.0061,19679.0000,NaN,,NaN,,0.006113956390620198,0.006113956390620198,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",SMT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1566.4000,0.0000,0.0000,,184.2535,192.4816,,,,,,,9528.3843,,9528.3843,,0.0000,,9528.3843,,0.0000,,9528.3843,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,9528.3843,,9528.3843,0.0000,,,,34.0136,41.2262,42.3421,44.8506,19.5150,1.0915,0.0000,0.0000,0.0000,0.0000,0.0042,0.7099,1.0740,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1400.6978,2293.0401,52.0000,100.0000,4.5965,0.0000,0.0000,0.0000,0.0000,N/A,0.39684760824750964,,,NOT CERTIFIED,N/A,0.9688644995072141,,,,,NOT CERTIFIED,N/A,,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
+#@ SHA256: dTxVYnrfa0WxgsHn+qqPTKI4rvliKYsF/3qTrkEsV8s=
-- 
GitLab