From 4426f2ce1327edf863ee5439bff95e3a626988ed Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 3 Jun 2020 15:00:50 +0200
Subject: [PATCH] update expected mod files - column P_aux renamed to
 P_aux_mech

---
 .../Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod              | 2 +-
 .../Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod | 2 +-
 .../MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod       | 2 +-
 .../MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod      | 2 +-
 ...asuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod | 2 +-
 .../MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod    | 2 +-
 .../Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod     | 2 +-
 ...erruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod | 2 +-
 .../Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod      | 2 +-
 .../Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod    | 2 +-
 .../Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod  | 2 +-
 .../MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod        | 2 +-
 .../Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod            | 2 +-
 .../MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod      | 2 +-
 .../TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod   | 2 +-
 .../Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod     | 2 +-
 .../EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod     | 2 +-
 .../EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod     | 2 +-
 .../EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod     | 2 +-
 .../TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod  | 2 +-
 .../Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod   | 2 +-
 .../Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod       | 2 +-
 .../40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod            | 2 +-
 .../Results/EngineOnlyCycles/AuxWriteModFileSumFile.vmod        | 2 +-
 .../EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod | 2 +-
 ..._Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod | 2 +-
 .../Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod            | 2 +-
 .../TestData/Results/Integration/job_1-Gear-Test-dist.vmod      | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
index d05d5b99c8..6e492c4e6c 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,77.1336,586.7144,-100.9497,4.8464,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.8464,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1532.1652,1532.1652,1532.1652,1532.1652,1532.1652,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.5194,586.7144,-100.9497,4.9335,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9335,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.9126,1545.9126,1545.9126,1545.9126,1545.9126,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.4776,586.7144,-100.9497,4.9309,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9309,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,1.0765,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.4974,1545.4974,1545.4974,1545.4974,1545.4974,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
index f636020b6a..84b7e2973b 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],TC locked,n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_gbx_shift_loss [kW],P_TC_loss [kW],P_TC_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],TCnu,TCmu,T_TC_out [Nm],n_TC_out [rpm],T_TC_in [Nm],n_TC_in [rpm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],TC locked,n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_gbx_shift_loss [kW],P_TC_loss [kW],P_TC_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],TCnu,TCmu,T_TC_out [Nm],n_TC_out [rpm],T_TC_in [Nm],n_TC_in [rpm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.4444,1.6000,0.5000,0.6111,-0.3000,0.0000,1,0,654.8081,342.9789,1165.6447,-148.2740,23.5185,79.9298,97.4732,-10.1674,5.1740,13.8445,0.0000,0.0000,0.0000,4.5000,6.8269,0.3540,0.0000,,,,,6.4729,0.1295,6.3434,0.0000,6.3434,0.1463,6.1971,-0.2850,0.0002,0.5609,5.9210,52.3744,1180.1884,1,1,0.0000,0.0000,0.0000,0.0000,4.5000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,5142.1842,5142.1842,5142.1842,5142.1842,5142.1842,1
 2.5000,1.0000,1.7083,4.5500,2.7000,1.0278,-0.3000,-0.0022,1,0,929.2011,687.8629,1765.0859,-156.1061,66.9330,171.7529,206.2703,-15.1900,13.9075,48.5254,0.0000,0.0000,0.0000,4.5000,30.4153,0.0000,0.0000,,,,,30.4153,0.6083,29.8070,0.0000,29.8070,0.6998,29.1072,-0.8106,0.0045,1.5952,28.3181,148.9397,1950.0842,1,1,0.0000,0.0000,0.0000,0.0000,4.5000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,12921.2145,12921.2145,12921.2145,12921.2145,12921.2145,1
 3.5000,1.0000,4.0278,8.3500,6.4000,1.0833,-0.3000,-0.0076,1,0,1206.4746,803.5155,1965.6481,-179.7769,101.5175,248.3434,290.5860,-22.7133,9.8227,87.1948,0.0000,0.0000,0.0000,4.5000,58.7718,0.0000,0.0000,,,,,58.7718,1.1754,57.5964,0.0000,57.5964,1.3536,56.2428,-1.4876,0.0254,2.9274,54.7775,273.3289,2053.3121,1,1,0.0000,0.0000,0.0000,0.0000,4.5000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,19297.9074,19297.9074,19297.9074,19297.9074,19297.9074,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
index f93b2b9bf3..b6a1300d17 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],TC locked,n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_gbx_shift_loss [kW],P_TC_loss [kW],P_TC_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],TCnu,TCmu,T_TC_out [Nm],n_TC_out [rpm],T_TC_in [Nm],n_TC_in [rpm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],TC locked,n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_gbx_shift_loss [kW],P_TC_loss [kW],P_TC_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],TCnu,TCmu,T_TC_out [Nm],n_TC_out [rpm],T_TC_in [Nm],n_TC_in [rpm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.3472,1.2500,0.2000,0.5833,-0.3000,0.0000,1,0,680.1720,285.2238,1217.3895,-148.4009,20.3158,86.7115,105.8467,-10.5702,6.8123,9.0035,0.0000,0.0000,0.0000,4.5000,4.9358,0.0987,0.0000,,,,,4.8370,0.0967,4.7403,0.0000,4.7403,0.1091,4.6312,-0.2227,0.0001,0.4382,4.4155,43.7394,1056.0351,1,1,0.0000,0.0000,0.0000,0.0000,4.5000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,4641.8931,4641.8931,4641.8931,4641.8931,4641.8931,1
 2.5000,1.0000,1.5833,4.4500,2.3000,1.1944,-0.3000,-0.0019,1,0,1053.6257,610.2090,1900.3633,-165.0944,67.3277,209.6774,253.7715,-18.2158,22.2413,40.5863,0.0000,0.0000,0.0000,4.5000,35.1459,0.7029,0.0000,,,,,34.4430,0.6889,33.7542,0.0000,33.7542,0.7954,32.9588,-0.7928,0.0045,1.5601,32.1870,155.7122,2112.2721,1,1,0.0000,0.0000,0.0000,0.0000,4.5000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,13152.6060,13152.6060,13152.6060,13152.6060,13152.6060,1
 3.5000,1.0000,3.9583,8.5500,6.6000,1.0833,-0.3000,-0.0074,1,0,1434.7572,600.9292,1937.3519,-208.5612,90.2881,291.0821,339.7986,-31.3358,15.2880,70.5001,0.0000,0.0000,0.0000,4.5000,61.4089,1.2282,0.0000,,,,,60.1807,1.2036,58.9771,0.0000,58.9771,1.3860,57.5911,-1.5232,0.0272,2.9975,56.0896,299.1774,1920.8793,1,1,0.0000,0.0000,0.0000,0.0000,4.5000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,18002.3323,18002.3323,18002.3323,18002.3323,18002.3323,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
index f95dedbbef..c77aba48f4 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,77.1336,586.7144,-100.9497,4.8464,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.8464,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1532.1652,1532.1652,1532.1652,1532.1652,1532.1652,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.5194,586.7144,-100.9497,4.9335,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9335,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.9126,1545.9126,1545.9126,1545.9126,1545.9126,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.4776,586.7144,-100.9497,4.9309,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9309,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,1.0765,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.4974,1545.4974,1545.4974,1545.4974,1545.4974,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod
index 4a7a6a2dfd..93d1223da0 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,77.1336,586.7144,-100.9497,4.8464,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.8464,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1532.1652,1532.1652,1532.1652,1532.1652,1532.1652,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.5194,586.7144,-100.9497,4.9335,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9335,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.9126,1545.9126,1545.9126,1545.9126,1545.9126,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.4776,586.7144,-100.9497,4.9309,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9309,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,1.0765,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.4974,1545.4974,1545.4974,1545.4974,1545.4974,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod
index dcad80d28f..80064dab27 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
index 9f2dd71368..cd9237e1b1 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod
index 2d760ed6d6..564d84e7dd 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
index d5665bbcee..55522bcbd3 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_aux_ALT [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,77.1336,586.7144,-100.9497,4.8464,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.8464,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1532.1652,1532.1652,1532.1652,1532.1652,1532.1652,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.5194,586.7144,-100.9497,4.9335,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9335,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,1.0443,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.9126,1545.9126,1545.9126,1545.9126,1545.9126,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,78.4776,586.7144,-100.9497,4.9309,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,4.9309,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,1.0765,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1545.4974,1545.4974,1545.4974,1545.4974,1545.4974,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
index 99f9702867..c6a058dcec 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
index ca4b765f3c..ea3ff6fb5e 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
index 1141b7d73b..b2e49d4fa5 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
index 538d5ddc07..488f39fcb0 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
index cf3d28408d..35f6c3c44e 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,60.5128,586.7144,-100.9497,3.8021,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8021,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1367.2875,1367.2875,1367.2875,1367.2875,1367.2875,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8892,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1381.0348,1381.0348,1381.0348,1381.0348,1381.0348,1
 3.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3.8544,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1375.5352,1375.5352,1375.5352,1375.5352,1375.5352,1
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
index b54a9b7703..f130fe670b 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
@@ -1,3 +1,3 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 1.5000,1.0000,,,,,,,2,1748.3243,511.0587,838.1341,-102.6453,93.5667,153.4490,153.4490,-18.7927,0.0000,93.5667,0.0000,93.5667,0.0000,93.5667,2.4087,0.0000,91.1580,0.0000,,,91.1580,2.1382,,,89.0198,,,,,,,459.3600,1895.0163,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,19058.1764,19058.1764,19058.1764,19058.1764,19058.1764,1
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod
index 9518a378a7..991becde13 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.6000,0.4000,,,,,,,2,688.9318,25.0286,626.1455,-81.9622,1.8057,45.1731,45.1731,-5.9131,0.0000,0.2009,0.0000,0.2009,1.6048,0.2009,0.1611,0.0000,0.0398,0.0000,,,0.0398,0.0398,,,0.0000,,,,,,,158.1713,2.4013,1.6048,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1137.1377,1137.1377,1137.1377,1137.1377,1137.1377,1
 1.0000,0.4000,,,,,,,2,688.9318,25.0589,626.1455,-81.9622,1.8079,45.1731,45.1731,-5.9131,0.0000,0.2009,0.0000,0.2009,1.6070,0.2009,0.1611,0.0000,0.0398,0.0000,,,0.0398,0.0398,,,0.0000,,,,,,,158.1713,2.4013,1.6070,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1137.5547,1137.5547,1137.5547,1137.5547,1137.5547,1
 1.4000,0.4000,,,,,,,2,688.9318,25.0416,626.1455,-81.9622,1.8066,45.1731,45.1731,-5.9131,0.0000,0.2009,0.0000,0.2009,1.6057,0.2009,0.1611,0.0000,0.0398,0.0000,,,0.0398,0.0398,,,0.0000,,,,,,,158.1713,2.4013,1.6057,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1137.3164,1137.3164,1137.3164,1137.3164,1137.3164,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod
index 4aefeb70b6..db0dfa7d90 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod	
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod
index bd36573148..80c50dbd88 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod	
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod
index cd9895d139..7b0ed5483b 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod	
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod
index 0ca6168cc8..0fa17b540d 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:50
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod
index 505fc9dd2d..3e667e8255 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:50
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod
index fb396e6430..a53ef734ca 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:50
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,31.8310,1101.3333,-148.0000,2.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,2.0000,2.0000,0.0000,0.0000,0.0000,0.0000,,,1761.2352,1761.2352,1761.2352,1761.2352,1761.2352,1
 1.5000,600.0000,31.8310,1101.3333,-148.0000,2.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,2.0000,2.0000,0.0000,0.0000,0.0000,0.0000,,,1761.2352,1761.2352,1761.2352,1761.2352,1761.2352,1
 2.5000,600.0000,31.8310,1101.3333,-148.0000,2.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,2.0000,2.0000,0.0000,0.0000,0.0000,0.0000,,,1761.2352,1761.2352,1761.2352,1761.2352,1761.2352,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod
index 2dd588abd2..0d8780be3b 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod	
@@ -1,4 +1,4 @@
-time [s],dt,dist [m]        ,v_act [km/h]    ,v_targ [km/h]   ,acc [m/s²],grad [%],n [1/min],Tq_eng [Nm],Tq_clutch [Nm],Tq_full [Nm],Tq_drag [Nm],Pe_eng [kW],Pe_full [kW],Pe_drag [kW],Pe_clutch [kW],Pa Eng [kW],P_aux [kW],Gear [-],Ploss GB [kW],Ploss Diff [kW],Ploss Retarder [kW],Pa GB [kW],Pa Veh [kW],Proll [kW],Pair [kW]   ,Pgrad [kW],Pwheel [kW]  ,P_brake_loss [kW]  ,P_aux_FAN [kW],P_aux_STP [kW],P_aux_AC [kW],P_aux_ES [kW],P_aux_PS [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+time [s],dt,dist [m]        ,v_act [km/h]    ,v_targ [km/h]   ,acc [m/s²],grad [%],n [1/min],Tq_eng [Nm],Tq_clutch [Nm],Tq_full [Nm],Tq_drag [Nm],Pe_eng [kW],Pe_full [kW],Pe_drag [kW],Pe_clutch [kW],Pa Eng [kW],P_aux_mech [kW],Gear [-],Ploss GB [kW],Ploss Diff [kW],Ploss Retarder [kW],Pa GB [kW],Pa Veh [kW],Proll [kW],Pair [kW]   ,Pgrad [kW],Pwheel [kW]  ,P_brake_loss [kW]  ,P_aux_FAN [kW],P_aux_STP [kW],P_aux_AC [kW],P_aux_ES [kW],P_aux_PS [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 1.5     ,1 ,0               ,0               ,0               ,0         ,2.95017 ,560      ,83.44429   ,0             ,1180        ,-149        ,4.893429   ,69.19881    ,-8.737817   ,0             ,0          ,4.893429 ,0       ,0            ,0              ,0                  ,0         ,0          ,0         ,0           ,0         ,0            ,0            ,1            ,0.432        ,0.35        ,1.771429    ,1.34        ,2065.827    ,-            ,2095.781      
 2.5     ,1 ,0               ,0               ,0               ,0         ,2.95017 ,560      ,83.44429   ,0             ,1180        ,-149        ,4.893429   ,69.19881    ,-8.737817   ,0             ,0          ,4.893429 ,0       ,0            ,0              ,0                  ,0         ,0          ,0         ,0           ,0         ,0            ,0            ,1            ,0.432        ,0.35        ,1.771429    ,1.34        ,2065.827    ,-            ,2095.781      
 3.5     ,1 ,0.5             ,1.8             ,29.9999988555908,1         ,2.95017 ,593.1891 ,271.5101   ,175.3559      ,1264.632    ,-148.1703   ,16.86583   ,78.55721    ,-9.204132   ,10.89286      ,1.079541   ,4.893429 ,5       ,0.3043601    ,0.2645191      ,0.02653578         ,0         ,7.729102   ,0.4559692 ,0.0005906814,2.111786  ,10.29745     ,0            ,1            ,0.432        ,0.35        ,1.771429    ,1.34        ,4088.593    ,-            ,4147.877      
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vmod
index 6096949e34..3c44ca21a3 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:56
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_FAN [kW],P_aux_PS [kW],P_aux_STP [kW],P_aux_ES [kW],P_aux_AC [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_FAN [kW],P_aux_PS [kW],P_aux_STP [kW],P_aux_ES [kW],P_aux_AC [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,1.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,5.4043,,,,,,,,,,,,,,,,,,,,,1.2000,1.6000,0.5400,1.7143,0.3500,,,,,,,0.0000,0.0000,0.0000,,0.0000,0
 1.5000,1.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,5.4043,,,,,,,,,,,,,,,,,,,,,1.2000,1.6000,0.5400,1.7143,0.3500,,,,,,,0.0000,0.0000,0.0000,,0.0000,0
 2.5000,1.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,5.4043,,,,,,,,,,,,,,,,,,,,,1.2000,1.6000,0.5400,1.7143,0.3500,,,,,,,0.0000,0.0000,0.0000,,0.0000,0
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod
index 6e0fb2be99..16e7a8d0f2 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod	
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:57
-time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
+time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_cycle [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],ICE On
 0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod
index 78ac2e7b80..f629ebfd6d 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod
@@ -1,4 +1,4 @@
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],Gear [-],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],Gear [-],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 0.2500,0.5000,6.9444,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1360.4331,-148.5176,41.6818,100.2274,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
 0.7500,0.5000,13.8889,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
 1.2500,0.5000,20.8333,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod
index 441810697b..6a17be5649 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod
@@ -1,4 +1,4 @@
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s²],grad [%],Gear [-],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss GB [kW],Pa GB [kW],P_ret_in [kW],Ploss Retarder [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],Pa Veh [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s²],grad [%],Gear [-],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss GB [kW],Pa GB [kW],P_ret_in [kW],Ploss Retarder [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],Pa Veh [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 0.2500,0.5000,6.9444,50.0000,50.0000,0.0000,0.0000,8,628.1187,409.8568,1111.5406,-148.1406,26.9589,73.1132,-9.7442,0.0000,26.9589,0.0000,13.4795,0.0000,26.9589,1.0811,0.0000,,0.0000,25.8779,4.1110,21.7668,0.0000,21.7668,0.0000,21.7668,0.0000,5.1935,16.5733,0.0000,5840.4100,5.8404,5.8404
 0.7500,0.5000,13.8889,50.0000,50.0000,0.0000,0.0000,8,628.1187,409.8568,1052.0304,-148.1406,26.9589,69.1988,-9.7442,0.0000,26.9589,0.0000,26.9589,0.0000,26.9589,1.0811,0.0000,,0.0000,25.8779,4.1110,21.7668,0.0000,21.7668,0.0000,21.7668,0.0000,5.1935,16.5733,0.0000,5840.4100,5.8404,5.8404
 1.2500,0.5000,20.8333,50.0000,50.0000,0.0000,0.0000,8,628.1187,409.8568,1052.0304,-148.1406,26.9589,69.1988,-9.7442,0.0000,26.9589,0.0000,26.9589,0.0000,26.9589,1.0811,0.0000,,0.0000,25.8779,4.1110,21.7668,0.0000,21.7668,0.0000,21.7668,0.0000,5.1935,16.5733,0.0000,5840.4100,5.8404,5.8404
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod
index 710ae1206a..331d74b38f 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod
@@ -1,5 +1,5 @@
 # VECTO-DEV 0.6.0.1875-DEV - 24.02.2020 15:54
-time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],DriverAction,EcoRollConditionsMet,PCCSegment,PCCState,ICE On
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_icd_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],P_aux_CYCLE [kW],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-ESS [g/h],FC-Final_mod [g/h],DriverAction,EcoRollConditionsMet,PCCSegment,PCCState,ICE On
 0.5000,1.0000,0.0000,0.0000,0.0000,0.0000,-0.0202,0.0000,0,560.0000,0.0000,1180.0000,-149.0000,0.0000,69.1988,69.1988,-8.7378,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-1.7290,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1256.0000,1256.0000,1256.0000,1256.0000,1256.0000,0,0,0,0,1
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,-0.0202,0.0000,0,560.0000,0.0000,1180.0000,-149.0000,0.0000,69.1988,69.1988,-8.7378,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-1.7290,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1256.0000,1256.0000,1256.0000,1256.0000,1256.0000,0,0,0,0,1
 2.3508,0.7016,0.2500,1.2828,12.8000,1.0157,-0.0202,-0.0001,5,593.6418,621.2334,1113.1292,-148.1590,38.6196,69.1988,78.6889,-9.2105,2.3723,36.2473,27.8191,8.4282,0.0000,8.4282,0.2518,0.0000,8.1764,0.0778,8.0985,0.4323,7.6662,0.2038,7.4624,0.0000,7.4624,0.1740,7.2884,-0.0134,0.0002,0.4252,6.8764,74.2110,1052.1134,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,8226.8452,8226.8452,8226.8452,8226.8452,8226.8452,6,0,0,0,1
-- 
GitLab