diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/distance.vsum b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/distance.vsum
index d61600c970eb09b84769566610e0365def098fc5..0c085aed0a8bcfe58ca6d9e36ef9347dd9733657 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/distance.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/distance.vsum
@@ -1,6 +1,6 @@
-# VECTO-DEV 0.7.8.2735-DEV - 28.06.2022 11:08
+# VECTO-DEV 0.7.8.2735-DEV - 28.06.2022 11:08,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],EC_el_final [kWh/km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],REESS Start SoC [%],REESS End SoC [%],ΔE_REESS [kWh],E_REESS_loss [kWh],E_REESS_T_chg [kWh],E_REESS_T_dischg [kWh],E_REESS_int_chg [kWh],E_REESS_int_dischg [kWh],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_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],n_EM_E2-em_avg [rpm],E_EM_E2-em_drive [kWh],E_EM_E2-em_gen [kWh],η_EM_E2-em_drive,η_EM_E2-em_gen,E_EM_E2_drive [kWh],E_EM_E2_gen [kWh],η_EM_E2_drive,η_EM_E2_gen,E_EM_E2_off_loss [kWh],E_EM_E2_transm_loss [kWh],E_EM_E2-em_loss [kWh],E_EM_E2_loss [kWh],EM E2 off time share [%],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%]
-1-0,BEV_ENG,LongHaul.vdri,Success,N/A,,N/A,-,4670.0000,3020.0000,,9590.0000,,,,,,,,,,,,,,,N/A,,4.8300,-,0.0065,20850.0000,0.0075,20850.0000,0.0055,16680.0000,0.0055,16680.0000,0.00676321944367285,0.00676321944367285,0.4210,1,3,0,N/A,gear_example,AMT,3.8600,1.9300,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,gear_example,2.5900,,,,,,,0,,324 Ah,,,,,4505.9494,100.1850,80.0422,-1.8207,1.1925,,,,,80,54.8650467396325,-119.4661,0.5174,1.1183,120.0671,1.1165,120.5827,54.9814,57.1163,,,0.0000,0.0000,0.0000,0.0000,4.4309,0.0000,0.0000,0.0000,18.3157,0.0000,0.0000,5.4292,0.0295,0.0000,51.1667,17.6990,-0.0479,5044.3850,97.2842,1.6551,NaN,0.7705,94.3657,1.7063,0.8149,0.7474,0.0672,2.9717,18.8878,21.9258,1.8965,,,,,,,,,,,,,,,0.0000,0.0000,,0.0000,0.6479,-0.6419,3.1780,3.1061,92.2289,85.0000,1.0000,1.0000,,,6.0000,1.4869,0.0000,100.0000,0.2364,2.8422,0.6224,,0,,,,,NOT CERTIFIED,N/A,0.811600340077259,,,,,,NOT CERTIFIED,N/A,0.933442891440693,N/A,NOT CERTIFIED,1.7543,0.3616,97.8841
-1-1,BEV_ENG,RegionalDelivery.vdri,Success,N/A,,N/A,-,4670.0000,3020.0000,,9590.0000,,,,,,,,,,,,,,,N/A,,4.8300,-,0.0065,20850.0000,0.0075,20850.0000,0.0055,16680.0000,0.0055,16680.0000,0.00676321944367285,0.00676321944367285,0.4210,1,3,0,N/A,gear_example,AMT,3.8600,1.9300,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,gear_example,2.5900,,,,,,,0,,324 Ah,,,,,5895.1618,100.0000,61.0670,7.2888,1.1339,,,,,80,56.1488360667601,-113.3860,0.4948,4.3238,117.2150,4.3154,117.7013,38.0685,43.3076,,,0.0000,0.0000,0.0000,0.0000,5.7969,0.0000,0.0000,0.0000,17.6163,0.0000,0.0000,5.6031,0.0943,0.0000,44.4817,17.6654,0.1917,3858.6452,94.5965,5.6843,NaN,0.8574,91.7586,5.8601,0.8191,0.8317,0.2459,3.0211,18.1826,21.4417,13.8977,,,,,,,,,,,,,,,0.0000,0.0000,,0.0000,0.7080,-0.6946,6.9995,6.9593,73.3868,85.0000,1.0000,1.0000,,,22.0000,12.6544,0.0000,100.0000,1.4147,6.0079,0.6755,,0,,,,,NOT CERTIFIED,N/A,0.824167410539719,,,,,,NOT CERTIFIED,N/A,0.937767247011085,N/A,NOT CERTIFIED,13.2822,1.3473,85.3705
-1-2,BEV_ENG,UrbanDelivery.vdri,Success,N/A,,N/A,-,4670.0000,3020.0000,,9590.0000,,,,,,,,,,,,,,,N/A,,4.8300,-,0.0065,20850.0000,0.0075,20850.0000,0.0055,16680.0000,0.0055,16680.0000,0.00676321944367285,0.00676321944367285,0.4210,1,3,0,N/A,gear_example,AMT,3.8600,1.9300,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,gear_example,2.5900,,,,,,,0,,324 Ah,,,,,13566.1252,99.9990,26.5364,9.8663,0.9783,,,,,80,59.4315178514067,-97.8311,0.5399,29.2956,126.5868,29.2279,127.0590,9.8009,21.8438,,,0.0000,0.0000,0.0000,0.0000,13.3400,0.0000,0.0000,0.0000,15.9248,0.0000,0.0000,6.9464,1.2145,0.0000,19.0092,17.6635,0.2606,1736.3009,100.7897,34.8892,NaN,0.9111,97.7660,35.9682,0.8444,0.8838,0.7788,4.1261,18.1057,22.9322,27.6392,,,,,,,,,,,,,,,0.0000,0.0000,,0.0000,0.8496,-0.8600,19.6663,19.1685,36.4788,85.0000,1.0000,1.0000,,,254.0000,24.6865,0.0000,100.0000,1.6745,17.3598,0.7728,,0,,,,,NOT CERTIFIED,N/A,0.883462027847366,,,,,,NOT CERTIFIED,N/A,0.9530263813905,N/A,NOT CERTIFIED,28.0081,6.2515,65.7404
-#@ SHA256: koAWFba/vBcRAT4fHu0ERPMocyIvJM4Nem2x7DPm5WI=
+1-0,BEV_ENG,LongHaul.vdri,Success,N/A,,N/A,-,4670,3020,,9590,,,,,,,,,,,,,,,N/A,,4.83,-,0.0065,20850,0.0075,20850,0.0055,16680,0.0055,16680,0.00676321944367285,0.00676321944367285,0.421,1,3,0,N/A,gear_example,AMT,3.86,1.93,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,gear_example,2.59,,,,,,,0,,324 Ah,,,,,4505.9494,100.185,80.0422,-1.8207,1.1925,,,,,80,54.8650467396325,-119.4661,0.5174,1.1183,120.0671,1.1165,120.5827,54.9814,57.1163,,,0,0,0,0,4.4309,0,0,0,18.3157,0,0,5.4292,0.0295,0,51.1667,17.699,-0.0479,5044.385,97.2842,1.6551,NaN,0.7705,94.3657,1.7063,0.8149,0.7474,0.0672,2.9717,18.8878,21.9258,1.8965,,,,,,,,,,,,,,,0,0,,0,0.6479,-0.6419,3.178,3.1061,92.2289,85,1,1,,,6,1.4869,0,100,0.2364,2.8422,0.6224,,0,,,,,NOT CERTIFIED,N/A,0.811600340077259,,,,,,NOT CERTIFIED,N/A,0.933442891440693,N/A,NOT CERTIFIED,1.7543,0.3616,97.8841
+9-4,BEV_ENG,RegionalDelivery.vdri,Success,N/A,,N/A,-,4670,3020,,9590,,,,,,,,,,,,,,,N/A,,4.83,-,0.0065,20850,0.0075,20850,0.0055,16680,0.0055,16680,0.00676321944367285,0.00676321944367285,0.421,1,3,0,N/A,gear_example,AMT,3.86,1.93,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,gear_example,2.59,,,,,,,0,,324 Ah,,,,,5895.1817,100,61.0668,7.2888,1.1339,,,,,80,56.1483492413172,-113.3883,0.4948,4.3182,117.2117,4.3097,117.698,38.0683,43.3079,,,0,0,0,0,5.7969,0,0,0,17.6164,0,0,5.6036,0.0944,0,44.4816,17.6654,0.1917,3858.6323,94.594,5.6769,NaN,0.8575,91.7562,5.8524,0.8191,0.8318,0.2506,3.0209,18.1798,21.4434,13.9153,,,,,,,,,,,,,,,0,0,,0,0.7068,-0.6934,7.0102,6.9769,73.3585,85,1,1,,,22,12.6544,0,100,1.4148,6.0082,0.675,,0,,,,,NOT CERTIFIED,N/A,0.824190785572426,,,,,,NOT CERTIFIED,N/A,0.937775087154743,N/A,NOT CERTIFIED,13.2824,1.3473,85.3703
+8-5,BEV_ENG,UrbanDelivery.vdri,Success,N/A,,N/A,-,4670,3020,,9590,,,,,,,,,,,,,,,N/A,,4.83,-,0.0065,20850,0.0075,20850,0.0055,16680,0.0055,16680,0.00676321944367285,0.00676321944367285,0.421,1,3,0,N/A,gear_example,AMT,3.86,1.93,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,gear_example,2.59,,,,,,,0,,324 Ah,,,,,13566.127,99.999,26.5364,9.8663,0.9783,,,,,80,59.4312860532656,-97.8322,0.5399,29.2956,126.5879,29.2279,127.0601,9.8009,21.8442,,,0,0,0,0,13.34,0,0,0,15.9248,0,0,6.9466,1.2145,0,19.0092,17.6635,0.2606,1736.3007,100.7916,34.8892,NaN,0.9111,97.7678,35.9682,0.8444,0.8838,0.7803,4.1262,18.1049,22.933,27.6426,,,,,,,,,,,,,,,0,0,,0,0.8495,-0.86,19.6664,19.1685,36.4786,85,1,1,,,254,24.6865,0,100,1.6735,17.3608,0.7727,,0,,,,,NOT CERTIFIED,N/A,0.883465014985353,,,,,,NOT CERTIFIED,N/A,0.953024140569492,N/A,NOT CERTIFIED,28.0081,6.2515,65.7404
+#@ SHA256: koAWFba/vBcRAT4fHu0ERPMocyIvJM4Nem2x7DPm5WI=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,