diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index 368a89a1434b5aa2b424a74daa71805084e1009c..214c3e2018fbbe92573f66d9aa52647f7a5c77c0 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-352-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8291,46.6396,15.8669,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,0.0000,0.0000,7792.4340,167.0777,7792.4340,167.0777,19.9854,,,,201.8945,186.2516,522.9532,,,,24.3832,27.2064,37.1745,37.7900,13.6359,0.2221,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.3147,0.0000,0.0000,1.8487,0.4618,0.0000,5.3307,3.1079,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.2095,1796.5316,26.0000,14.3957,5.0038,0.0000,39.9538,0.2852,N/A,0.408863773774671,,,,,NOT CERTIFIED,N/A,0.975245910893873,,,,,,NOT CERTIFIED,N/A,0.859488809846527,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
-#@ SHA256: iHMYhYonS8DR9sAn6qBVZ1dj4hY/dibzvQvWIJDBePU=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8291,46.6396,15.8669,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,0.0000,0.0000,7792.4340,167.0777,7792.4340,167.0777,19.9854,,,,201.8945,186.2516,522.9532,,,,24.3832,27.2064,37.1745,37.7900,13.6359,0.2221,0.0000,1.9832,1.9832,0.0000,0.0071,0.0000,0.0000,0.3147,0.0000,0.0000,1.8487,0.4618,0.0000,5.3307,3.1079,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.2095,1796.5316,26.0000,14.3957,5.0038,0.0000,0.0000,39.9538,0.2852,N/A,0.408863773774671,,,,,NOT CERTIFIED,N/A,0.975245910893873,,,,,,NOT CERTIFIED,N/A,0.859488809846527,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: Qof/mj7E5Yyg+zvVR3UTpSwY2kfdrAB86hcaJMpdTvg=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index f32f010b903a4bebff2945fb87e32f5e156e91dc..52b0d9a84dd63d6cf8e65f9d0900693bf4dec147 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-353-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,1299.0000,16.8272,46.6344,15.8669,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,0.0000,0.0000,7969.6084,170.8956,7969.6084,170.8956,20.4421,,,,202.2413,186.4911,534.9033,,,,24.3784,27.2016,38.1783,38.7492,13.9820,0.2060,0.0000,1.9832,0.3799,2.3631,0.0070,0.0000,0.0000,0.3147,0.0000,0.0000,1.8485,0.4461,0.0000,5.3293,3.1075,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1121.8867,1796.5316,26.0000,14.3957,5.1578,0.0000,39.9538,0.2805,N/A,0.40992162394878,,,,,NOT CERTIFIED,N/A,0.975246396559554,,,,,,NOT CERTIFIED,N/A,0.859479878569248,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
-#@ SHA256: U09KoQqqTdrMLeAZuGvd+B/cR1U3AY4EsRD+iCnR1EY=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,1299.0000,16.8272,46.6344,15.8669,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,0.0000,0.0000,7969.6084,170.8956,7969.6084,170.8956,20.4421,,,,202.2413,186.4911,534.9033,,,,24.3784,27.2016,38.1783,38.7492,13.9820,0.2060,0.0000,1.9832,0.3799,2.3631,0.0000,0.0070,0.0000,0.0000,0.3147,0.0000,0.0000,1.8485,0.4461,0.0000,5.3293,3.1075,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1121.8867,1796.5316,26.0000,14.3957,5.1578,0.0000,0.0000,39.9538,0.2805,N/A,0.40992162394878,,,,,NOT CERTIFIED,N/A,0.975246396559554,,,,,,NOT CERTIFIED,N/A,0.859479878569248,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: VxBhPJuj3BcrHEPZYTa5sR5f6IROfs/aPpKYWx54g6E=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index ced0971f083aa29cbd95754101735c7e44cfb49e..48c094fb92badbdc76ec9411c700672ac5abab76 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.2.2118-DEV - 13.11.2020 00:03
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-348-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,0.0000,0.0000,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,,203.8175,185.9065,522.0799,,,,24.4682,27.2335,37.2702,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,0.2677,N/A,0.408463434370422,,,,,NOT CERTIFIED,N/A,0.974391308464303,,,,,,NOT CERTIFIED,N/A,0.857838912545851,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
-#@ SHA256: /rTLGo3nzYZZEWYghXPYKJTyu6wN0e5lnKq7T/aiu7I=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,0.0000,0.0000,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,,203.8175,185.9065,522.0799,,,,24.4682,27.2335,37.2702,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0000,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,0.0000,40.1848,0.2677,N/A,0.408463434370422,,,,,NOT CERTIFIED,N/A,0.974391308464303,,,,,,NOT CERTIFIED,N/A,0.857838912545851,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+#@ SHA256: LFbB7IJTV95xTCSWx88pQLN0FrMD16nCpgH0Uj74c9U=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
index 31bfed3d9f7bfa0ddb9595d9dcda9e6eb4f6701d..7e4e7940dbec143df03cb7f5643cff4f9bd3dd56 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.2.2118-DEV - 13.11.2020 00:03
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
-345-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,,379.0000,2.8864,27.4168,0.0036,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,0.0000,0.0000,10440.7854,380.8177,10440.7854,380.8177,45.5524,9.4901,,,185.1841,172.6443,1191.9594,248.3249,,,11.9262,40.8256,48.3761,51.5662,5.4288,0.3358,0.0000,0.4738,0.4738,0.0000,0.4207,10.4379,0.2697,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,964.9250,1657.1120,25.0000,20.0528,0.0000,0.0000,33.7731,0.0000,N/A,0.416395634531028,Standard values,,0.92445617108456,0.655260146470225,NOT CERTIFIED,N/A,0.947589701762487,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
-#@ SHA256: HnWhbZC8XxPj9b8ZpaACPyeh8mspp0sv0wmIElWnlZQ=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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 [%]
+1-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,,379.0000,2.8864,27.4168,0.0036,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,10440.7854,380.8177,0.0000,0.0000,10440.7854,380.8177,10440.7854,380.8177,45.5524,9.4901,,,185.1841,172.6443,1191.9594,248.3249,,,11.9262,40.8256,48.3761,51.5662,5.4288,0.3358,0.0000,0.4738,0.4738,0.0000,0.0000,0.4207,10.4379,0.2697,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,964.9250,1657.1120,25.0000,20.0528,0.0000,0.0000,0.0000,33.7731,0.0000,N/A,0.416395634531028,Standard values,,0.92445617108456,0.655260146470225,NOT CERTIFIED,N/A,0.947589701762487,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+#@ SHA256: yE+6mmWGqGW668S99FFwMfaSi5RKt+S52r28m+lDRvE=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
index 4528cbc7fc398040afc0a222f9409b9d83b8e1d7..20014fd73b840008823e4d232cd5a0c2cb990dfb 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.2.2118-DEV - 13.11.2020 00:03
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-346-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,,272.0000,1.0227,13.5358,-0.0054,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,0.0000,0.0000,7419.0154,548.1021,7419.0154,548.1021,65.5625,13.6588,,,230.3282,180.4381,1715.5595,357.4082,,,5.1884,22.5562,28.9249,32.6752,2.4688,0.2834,0.0000,0.3400,0.3400,0.0000,0.0715,23.3539,0.4117,0.0000,0.0000,0.0429,0.9386,0.0000,0.0337,0.3584,-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.7549,1.3056,981.1320,1857.4892,45.0000,33.8235,1.1029,0.0000,33.8235,0.9147,N/A,0.371318449657612,Standard values,,0.970104309120247,0.841552810143989,NOT CERTIFIED,N/A,0.830181892893321,,,,,,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: MJlVIDS9IAX7le5Re3jhuau++vPykbj5gu6EuaGeObs=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,,272.0000,1.0227,13.5358,-0.0054,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,7419.0154,548.1021,0.0000,0.0000,7419.0154,548.1021,7419.0154,548.1021,65.5625,13.6588,,,230.3282,180.4381,1715.5595,357.4082,,,5.1884,22.5562,28.9249,32.6752,2.4688,0.2834,0.0000,0.3400,0.3400,0.0000,0.0000,0.0715,23.3539,0.4117,0.0000,0.0000,0.0429,0.9386,0.0000,0.0337,0.3584,-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.7549,1.3056,981.1320,1857.4892,45.0000,33.8235,1.1029,0.0000,0.0000,33.8235,0.9147,N/A,0.371318449657612,Standard values,,0.970104309120247,0.841552810143989,NOT CERTIFIED,N/A,0.830181892893321,,,,,,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: 27Qrob2jGmtlh9xYojeCC8ChOYUfidaHe0AR4bXhuP4=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index 011dee32d0b7f007fb3e2a8abeb2e8fcfab4fb8a..954b59bd99a1663a0fc273f96f64b953edccc943 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.2.2118-DEV - 13.11.2020 00:03
-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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-347-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,0.0000,0.0000,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,,204.3525,186.9375,532.4196,,,,24.4663,27.2199,38.2533,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,0.2560,N/A,0.410575873210116,,,,,NOT CERTIFIED,N/A,0.97438595848267,,,,,,NOT CERTIFIED,N/A,0.857785140124247,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: Tux6axAgPF0taBgPFpUxvXJf0q3Hn+XgY0ErjE0AMXs=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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 [%]
+3-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,0.0000,0.0000,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,,204.3525,186.9375,532.4196,,,,24.4663,27.2199,38.2533,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0000,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,0.0000,40.1848,0.2560,N/A,0.410575873210116,,,,,NOT CERTIFIED,N/A,0.97438595848267,,,,,,NOT CERTIFIED,N/A,0.857785140124247,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: htz49M7LDkA9+LwtMjp7yAPrqhnujGNB3O01WIyWq0I=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index 324a53bace5e87ab97ae44c780420e3e6b89a5a9..b25d2bd5ea6f9a7154e5af34b4ad63473de6781e 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-350-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8711,46.7558,15.8669,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,0.0000,0.0000,6299.2293,134.7261,6299.2293,134.7261,16.1156,,,,205.5622,185.0752,421.6927,,,,15.7985,20.1036,29.0646,29.8629,10.7755,0.2881,0.0000,1.9832,1.9832,0.0270,0.0000,0.0000,0.2879,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1085.0944,1962.3354,22.0000,14.3957,1.4627,0.0000,40.1848,0.0000,N/A,0.399686339290113,,,,,NOT CERTIFIED,N/A,0.97209000485083,,,,,,NOT CERTIFIED,N/A,0.83229979692204,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
-#@ SHA256: sTB5CvwSaiaDPyBKYhCA5AcjMzlp/znrWU0YGcmTiu8=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8711,46.7558,15.8669,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,0.0000,0.0000,6299.2293,134.7261,6299.2293,134.7261,16.1156,,,,205.5622,185.0752,421.6927,,,,15.7985,20.1036,29.0646,29.8629,10.7755,0.2881,0.0000,1.9832,1.9832,0.0000,0.0270,0.0000,0.0000,0.2879,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1085.0944,1962.3354,22.0000,14.3957,1.4627,0.0000,0.0000,40.1848,0.0000,N/A,0.399686339290113,,,,,NOT CERTIFIED,N/A,0.97209000485083,,,,,,NOT CERTIFIED,N/A,0.83229979692204,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
+#@ SHA256: T4q2+jh7ko9xbO95ka+bvjkBa7HH9EvVGDoDJXXDLiQ=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index afa3352c572a1a7e416397eef7c4a6b47ddca6fe..78f8d92014a6ce5310ff07e289e81fd9b2048780 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-351-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,1299.0000,16.8711,46.7559,15.8669,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,0.0000,0.0000,6457.4048,138.1088,6457.4048,138.1088,16.5202,,,,206.6380,185.6690,432.2806,,,,15.7988,20.1038,30.0279,30.7900,11.1101,0.2750,0.0000,1.9824,0.3775,2.3598,0.0269,0.0000,0.0000,0.2906,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1418,1962.3354,23.0000,14.3957,1.6166,0.0000,40.1848,0.0000,N/A,0.402000564697536,,,,,NOT CERTIFIED,N/A,0.97207370798227,,,,,,NOT CERTIFIED,N/A,0.832297265064532,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: CBrJqjXxE6Pg2nihx8Q3zKD/A0gqI4nv/BLghGYY3xQ=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,1299.0000,16.8711,46.7559,15.8669,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,0.0000,0.0000,6457.4048,138.1088,6457.4048,138.1088,16.5202,,,,206.6380,185.6690,432.2806,,,,15.7988,20.1038,30.0279,30.7900,11.1101,0.2750,0.0000,1.9824,0.3775,2.3598,0.0000,0.0269,0.0000,0.0000,0.2906,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1418,1962.3354,23.0000,14.3957,1.6166,0.0000,0.0000,40.1848,0.0000,N/A,0.402000564697536,,,,,NOT CERTIFIED,N/A,0.97207370798227,,,,,,NOT CERTIFIED,N/A,0.832297265064532,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: v6xFhMsWrxgSAoAKDJkF+TSMIwPp0NTuSnh50A0+Stc=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
index e3301b98ce6509be95adfbc43e4e81079630afa2..76c7f378393337d8d0e0ea48653fe2e81f7562e9 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-349-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8351,46.6562,15.8669,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,0.0000,0.0000,7783.1500,166.8192,7783.1500,166.8192,19.9544,,,,202.4795,185.6254,522.1440,,,,24.4061,27.1915,37.1709,37.6385,13.5812,0.1687,0.0000,1.9832,1.9832,0.0067,0.0000,0.0000,0.3210,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.6963,1701.8773,22.0000,14.3957,4.3880,0.0000,39.5689,0.2514,N/A,0.40771030818796,,,,,NOT CERTIFIED,N/A,0.974168745921067,,,,,,NOT CERTIFIED,N/A,0.858764390582281,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
-#@ SHA256: Hy9oG0ms3pUmebkdVYk+M3Gykjv4ap4kpE9BTL+wGRU=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8351,46.6562,15.8669,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,0.0000,0.0000,7783.1500,166.8192,7783.1500,166.8192,19.9544,,,,202.4795,185.6254,522.1440,,,,24.4061,27.1915,37.1709,37.6385,13.5812,0.1687,0.0000,1.9832,1.9832,0.0000,0.0067,0.0000,0.0000,0.3210,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.6963,1701.8773,22.0000,14.3957,4.3880,0.0000,0.0000,39.5689,0.2514,N/A,0.40771030818796,,,,,NOT CERTIFIED,N/A,0.974168745921067,,,,,,NOT CERTIFIED,N/A,0.858764390582281,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
+#@ SHA256: SiLPw4Nsuok/UGWkJV0yk4BI68DA7UBnqtmoUMYgc84=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index 4bdc0db258ba094e22ec5a9baf9ef69be2e214c9..f815bbee810f4299cb25472bb5391e64ae30e9c5 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-355-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8420,46.6752,15.8669,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,0.0000,0.0000,6308.6325,135.1604,6308.6325,135.1604,16.1675,,,,203.6324,184.8872,423.0521,,,,15.7789,20.1402,28.9967,29.9124,10.7934,0.3304,0.0000,1.9832,1.9832,0.0082,0.0000,0.0000,0.2780,0.0000,0.0000,1.8453,0.6547,0.0000,2.2238,3.1102,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3176,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.6138,1796.5316,26.0000,14.3957,3.0023,0.0000,39.9538,0.3005,N/A,0.39975232829822,,,,,NOT CERTIFIED,N/A,0.973102441420963,,,,,,NOT CERTIFIED,N/A,0.834416199092332,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
-#@ SHA256: mSsm1LCx09D1ZKBW9gRhEGKWBxgcOzQem38jJjxXX9c=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8420,46.6752,15.8669,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,0.0000,0.0000,6308.6325,135.1604,6308.6325,135.1604,16.1675,,,,203.6324,184.8872,423.0521,,,,15.7789,20.1402,28.9967,29.9124,10.7934,0.3304,0.0000,1.9832,1.9832,0.0000,0.0082,0.0000,0.0000,0.2780,0.0000,0.0000,1.8453,0.6547,0.0000,2.2238,3.1102,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3176,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.6138,1796.5316,26.0000,14.3957,3.0023,0.0000,0.0000,39.9538,0.3005,N/A,0.39975232829822,,,,,NOT CERTIFIED,N/A,0.973102441420963,,,,,,NOT CERTIFIED,N/A,0.834416199092332,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
+#@ SHA256: L6023O6RLGwUJ/AfbYdd9AeAJdLisHpdC32PD3G0JhU=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index 23a4dd97861eb8124f8035bdeaa917013c50d499..66cf6a246e4d39ede195dcdecc30223e0cf11302 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-358-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,1299.0000,16.8410,46.6724,15.8669,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,0.0000,0.0000,6477.6109,138.7889,6477.6109,138.7889,16.6015,,,,204.0340,184.9917,434.4094,,,,15.7782,20.1395,29.9752,30.8444,11.1297,0.3136,0.0000,1.9832,0.3795,2.3627,0.0082,0.0000,0.0000,0.2781,0.0000,0.0000,1.8453,0.6286,0.0000,2.2237,3.1100,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3177,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.3974,1796.5316,26.0000,14.3957,3.1563,0.0000,39.9538,0.3014,N/A,0.40145421611878,,,,,NOT CERTIFIED,N/A,0.973103928336738,,,,,,NOT CERTIFIED,N/A,0.834411356629346,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
-#@ SHA256: T8YI6YjfYo7++AdMoT05q8jh9BS2Y1W76e8uYfWgxIw=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_ALT [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,1299.0000,16.8410,46.6724,15.8669,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,0.0000,0.0000,6477.6109,138.7889,6477.6109,138.7889,16.6015,,,,204.0340,184.9917,434.4094,,,,15.7782,20.1395,29.9752,30.8444,11.1297,0.3136,0.0000,1.9832,0.3795,2.3627,0.0000,0.0082,0.0000,0.0000,0.2781,0.0000,0.0000,1.8453,0.6286,0.0000,2.2237,3.1100,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3177,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.3974,1796.5316,26.0000,14.3957,3.1563,0.0000,0.0000,39.9538,0.3014,N/A,0.40145421611878,,,,,NOT CERTIFIED,N/A,0.973103928336738,,,,,,NOT CERTIFIED,N/A,0.834411356629346,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
+#@ SHA256: 0s/iDA8WTlURPtmf+NS3f+Vm5Fb12HPJNM32uStSDfo=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index 777d8ebdf33a19cce149fe695077d09b486b12e8..6150aad59400a9222fb92f09ecef34f0ba3ba1cc 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-356-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8487,46.6939,15.8669,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,0.0000,0.0000,4881.4833,104.5421,4881.4833,104.5421,12.5050,,,,201.6955,181.6952,327.2169,,,,7.2456,13.7599,20.8691,22.2872,8.0420,0.5117,0.0000,1.9832,1.9832,0.0065,0.0000,0.0000,0.2508,0.0000,0.0000,1.8435,0.8319,0.0000,-0.8568,3.1115,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3157,-0.3385,22.9407,21.4011,41.2625,80.5095,1.1306,1.6261,1113.9153,1620.3683,22.0000,14.3957,2.3095,0.0000,40.0308,0.3086,N/A,0.384926976360942,,,,,NOT CERTIFIED,N/A,0.970291794117452,,,,,,NOT CERTIFIED,N/A,0.803929612801758,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,49.9615,20.9392
-#@ SHA256: xUWasy6QMkQ2zXw4HMTPdTJQUl/RgFFWdn3b4/EmTwg=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8487,46.6939,15.8669,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,0.0000,0.0000,4881.4833,104.5421,4881.4833,104.5421,12.5050,,,,201.6955,181.6952,327.2169,,,,7.2456,13.7599,20.8691,22.2872,8.0420,0.5117,0.0000,1.9832,1.9832,0.0000,0.0065,0.0000,0.0000,0.2508,0.0000,0.0000,1.8435,0.8319,0.0000,-0.8568,3.1115,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3157,-0.3385,22.9407,21.4011,41.2625,80.5095,1.1306,1.6261,1113.9153,1620.3683,22.0000,14.3957,2.3095,0.0000,0.0000,40.0308,0.3086,N/A,0.384926976360942,,,,,NOT CERTIFIED,N/A,0.970291794117452,,,,,,NOT CERTIFIED,N/A,0.803929612801758,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,49.9615,20.9392
+#@ SHA256: a+AYAEguB3fi6x99aZK0AlliMRxmlNzuRy4qkqrkmL4=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index 0e0dd0e6f3bac6d054921943abe33885b29bde4d..267cdcd8919b971905d39f5174763fb67f945919 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-357-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8459,46.6860,15.8669,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,0.0000,0.0000,5476.1124,117.2966,5476.1124,117.2966,14.0307,,,,202.2112,183.2375,367.1384,,,,11.0840,16.2812,24.3063,25.4133,9.1700,0.3995,0.0000,1.9832,1.9832,0.0074,0.0000,0.0000,0.2593,0.0000,0.0000,1.8447,0.6764,0.0000,0.5289,3.1110,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3162,-0.3290,23.0177,22.4788,40.1078,80.5095,1.1306,1.6261,1114.7942,1620.7745,22.0000,14.3957,2.6944,0.0000,40.0308,0.3080,N/A,0.391258520914826,,,,,NOT CERTIFIED,N/A,0.971397292137282,,,,,,NOT CERTIFIED,N/A,0.817191452320676,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.0385,20.7852
-#@ SHA256: /NIFSF8iw+NmfgyN/yHAwulx17hTxjggNFRHkWWkJJQ=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8459,46.6860,15.8669,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,0.0000,0.0000,5476.1124,117.2966,5476.1124,117.2966,14.0307,,,,202.2112,183.2375,367.1384,,,,11.0840,16.2812,24.3063,25.4133,9.1700,0.3995,0.0000,1.9832,1.9832,0.0000,0.0074,0.0000,0.0000,0.2593,0.0000,0.0000,1.8447,0.6764,0.0000,0.5289,3.1110,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3162,-0.3290,23.0177,22.4788,40.1078,80.5095,1.1306,1.6261,1114.7942,1620.7745,22.0000,14.3957,2.6944,0.0000,0.0000,40.0308,0.3080,N/A,0.391258520914826,,,,,NOT CERTIFIED,N/A,0.971397292137282,,,,,,NOT CERTIFIED,N/A,0.817191452320676,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.0385,20.7852
+#@ SHA256: U1cKbngHVWqdoU/AQC1I5eEpZIYyu+8xy2RX7ODAkhM=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index 149acc407d97087a93c502a5310d46e646db48ee..2bd4578be2e62c35da19a48755f88805af4b37cc 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-354-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8465,46.6878,15.8669,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,0.0000,0.0000,5246.2770,112.3693,5246.2770,112.3693,13.4413,,,,201.7282,182.5394,351.7160,,,,9.6187,15.2940,22.9820,24.1937,8.7299,0.4372,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.2561,0.0000,0.0000,1.8442,0.7314,0.0000,0.0000,3.1111,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3342,22.9407,21.8630,40.8006,80.5095,1.1306,1.6261,1113.8399,1620.3683,22.0000,14.3957,2.5404,0.0000,40.0308,0.3136,N/A,0.388800058742699,,,,,NOT CERTIFIED,N/A,0.970983969739437,,,,,,NOT CERTIFIED,N/A,0.81265430145678,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,49.9615,20.9392
-#@ SHA256: hHfFg+g/foPaVKGpvSRMJSGj6cog7TmT+xA7RIh81ug=
+# VECTO-DEV 0.7.2.2118-DEV - 02.12.2020 08:28
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8465,46.6878,15.8669,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,0.0000,0.0000,5246.2770,112.3693,5246.2770,112.3693,13.4413,,,,201.7282,182.5394,351.7160,,,,9.6187,15.2940,22.9820,24.1937,8.7299,0.4372,0.0000,1.9832,1.9832,0.0000,0.0071,0.0000,0.0000,0.2561,0.0000,0.0000,1.8442,0.7314,0.0000,0.0000,3.1111,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3342,22.9407,21.8630,40.8006,80.5095,1.1306,1.6261,1113.8399,1620.3683,22.0000,14.3957,2.5404,0.0000,0.0000,40.0308,0.3136,N/A,0.388800058742699,,,,,NOT CERTIFIED,N/A,0.970983969739437,,,,,,NOT CERTIFIED,N/A,0.81265430145678,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,49.9615,20.9392
+#@ SHA256: uA1ryL8AUCeRVDsClBmOjJ2UEnuTy14xAGoiodhFt4g=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index 3206d218e271be8ddae7bf4e48328ba222cd5d8e..1576952d1b30d7f7f06aeea8a4258feb98bbdd52 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-359-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,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.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
-#@ SHA256: e2o86Vaypw/cp2kORQ+/HeN1JqmmRrS9qs++XHu7PbQ=
+# VECTO-DEV 0.7.2.2118-DEV - 01.12.2020 19:59
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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 [%]
+359-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,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.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,66.6667,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: FhUPlRArOnxN+WpSAv9fTMw+ma4FgxkxwK2YtQiqTeI=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index 02e1059b269e5ee4d2034799c572e90a1b8df431..ecdc53d6c42e8bf337d04a15ad7a3895e59c4b93 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.2.2118-DEV - 13.11.2020 00:04
-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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-360-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,1566.4000,0.0000,0.0000,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,0.0000,,10010.8980,,10010.8980,,,,,,191.7070,184.6096,0.0000,,,,34.0136,41.2262,45.0559,47.3115,20.5857,0.9814,-0.0004,1.5039,1.5039,0.0042,0.0000,0.0000,0.7090,0.0000,0.0000,1.0753,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,7.1502,0.0000,0.0000,0.0000,N/A,0.398444664591191,,,,,NOT CERTIFIED,N/A,0.968873340511093,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
-#@ SHA256: qcRrxTSRtulF4R5FDUqucuU53AHWNXKVHf19eLvlZis=
+# VECTO-DEV 0.7.2.2118-DEV - 01.12.2020 19:59
+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 cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_CYCLE [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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 [%]
+360-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,1566.4000,0.0000,0.0000,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,10010.8980,,0.0000,,10010.8980,,10010.8980,,,,,,191.7070,184.6096,0.0000,,,,34.0136,41.2262,45.0559,47.3115,20.5857,0.9814,-0.0004,1.5039,1.5039,0.0000,0.0042,0.0000,0.0000,0.7090,0.0000,0.0000,1.0753,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,7.1502,100.0000,0.0000,0.0000,0.0000,N/A,0.398444664591191,,,,,NOT CERTIFIED,N/A,0.968873340511093,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
+#@ SHA256: 1WMllwnS5z024eI3XnjhJOoLzDhMkF8WVsRUPiiiZEw=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
index 403a07fcb4c8dfd9f9ac0871d3724e0a2b6c93f6..6e134a32be65b9f9f2e388c94e8a33973fbe807c 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.2.2118-DEV - 13.11.2020 10:10
-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],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
-0-0,AuxWriteModFileSumFile,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
-#@ SHA256: +Z7mhTG3StCAWrcgWpNw5W704dBsp/pnIkq6XnR+XHs=
+# VECTO-DEV 0.7.2.2118-DEV - 01.12.2020 19:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],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_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [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_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],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
+0-0,AuxWriteModFileSumFile,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,0.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
+#@ SHA256: z2RJMCKSVoTNgnFS08Hie7aHMPbgZ7iUqZEgiyP8mVI=