diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
index 2e9629f3db728a31b7474dbfddbded90a0cd2abf..5d7f24606d04a418e7c6c17f5998bea1d0871cbc 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.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],P_aux_ALT,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 [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],P_aux_ALT,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 1.5000,1.0000,,0.0000,,,,0,622.2222,61.3666,565.7603,-98.5662,3.9986,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,4.8477,0.0000,0.0000,0.0000,0.0000,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.0456,1396.2007,1.3962,1.3962
 2.5000,1.0000,,0.0000,,,,0,600.0000,78.5194,586.7144,-100.9497,4.9335,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1.0443,1545.9126,1.5459,1.5459
 3.5000,1.0000,,0.0000,,,,0,600.0000,78.4776,586.7144,-100.9497,4.9309,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1.0765,1545.4974,1.5455,1.5455
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
index 37214db65f3cf393b01ec4719e2a802a0bd17148..38a59d284bdfb96d02c766961144b84017248dc6 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.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],P_aux_ALT,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 [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],P_aux_ALT,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 1.5000,1.0000,,0.0000,,,,0,600.0000,77.1336,586.7144,-100.9497,4.8464,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,1.0443,1532.1652,1.5322,1.5322
 2.5000,1.0000,,0.0000,,,,0,601.6135,79.2565,585.1409,-100.7767,4.9932,36.8644,-6.3490,0.0596,0.0000,0.0000,0.0000,4.9336,0.0000,0.0000,0.0000,0.0000,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.0444,1554.7089,1.5547,1.5547
 3.5000,1.0000,,0.0000,,,,0,601.6135,77.3223,585.1409,-100.7767,4.8714,36.8644,-6.3490,-0.0596,0.0000,0.0000,0.0000,4.9310,0.0000,0.0000,0.0000,0.0000,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.0766,1535.5221,1.5355,1.5355
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod
index e149c64cc39717aef0daf976acd5c9d63eec2cad..1f3400d7f981c90e7dbdc03661ab57cd28f55654 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.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],P_aux_ALT,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 [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],P_aux_ALT,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 1.5000,1.0000,,0.0000,,,,0,600.0000,77.1336,586.7144,-100.9497,4.8464,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,1.0443,1532.1652,1.5322,1.5322
 2.5000,1.0000,,0.0000,,,,0,601.6135,79.2565,585.1409,-100.7767,4.9932,36.8644,-6.3490,0.0596,0.0000,0.0000,0.0000,4.9336,0.0000,0.0000,0.0000,0.0000,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.0444,1554.7089,1.5547,1.5547
 3.5000,1.0000,,0.0000,,,,0,601.6135,77.3223,585.1409,-100.7767,4.8714,36.8644,-6.3490,-0.0596,0.0000,0.0000,0.0000,4.9310,0.0000,0.0000,0.0000,0.0000,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.0766,1535.5221,1.5355,1.5355
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod
index c8323b8a6e6d76ae4f3bf0a0bd78410199acd047..e8718eb58f0954dde23e88f7ff89d75dd5937e83 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.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^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]
 1.5000,1.0000,,0.0000,,,,0,600.0000,60.5128,586.7144,-100.9497,3.8021,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,1367.2875,1.3673,1.3673
 2.5000,1.0000,,0.0000,,,,0,601.6135,62.6789,585.1409,-100.7767,3.9488,36.8644,-6.3490,0.0596,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,1390.2588,1.3903,1.3903
 3.5000,1.0000,,0.0000,,,,0,601.6135,60.2335,585.1409,-100.7767,3.7948,36.8644,-6.3490,-0.0596,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,1366.0012,1.3660,1.3660
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
index 1276b5612a417b9a0b88cf8d52a61c901f693fc7..9ff091454f151a3038649f76292d1c189c54a7a2 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.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^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]
 1.5000,1.0000,,0.0000,,,,0,600.0000,60.5128,586.7144,-100.9497,3.8021,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,1367.2875,1.3673,1.3673
 2.5000,1.0000,,0.0000,,,,0,601.6135,62.6789,585.1409,-100.7767,3.9488,36.8644,-6.3490,0.0596,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,1390.2588,1.3903,1.3903
 3.5000,1.0000,,0.0000,,,,0,601.6135,60.2335,585.1409,-100.7767,3.7948,36.8644,-6.3490,-0.0596,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,1366.0012,1.3660,1.3660
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
index 27966d357605ca3e4b36e2e432be9be90b6f9213..4bb915968b93b58b255a3bba2d6957f4d1d1eb2b 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.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],P_aux_ALT,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 [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],P_aux_ALT,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
 1.5000,1.0000,,0.0000,,,,0,622.2222,61.3666,565.7603,-98.5662,3.9986,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,4.8477,0.0000,0.0000,0.0000,0.0000,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.0456,1396.2007,1.3962,1.3962
 2.5000,1.0000,,0.0000,,,,0,600.0000,78.5194,586.7144,-100.9497,4.9335,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1.0443,1545.9126,1.5459,1.5459
 3.5000,1.0000,,0.0000,,,,0,600.0000,78.4776,586.7144,-100.9497,4.9309,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1.0765,1545.4974,1.5455,1.5455
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
index 2ec3f7c7f1823994fcf8c0382b8259a8e18ea753..8e4c42830eb79a2499e4c07aebef0da653715abc 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.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 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^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]
 1.5000,1.0000,0.0000,0.0000,,,,0,622.2222,45.3199,565.7603,-98.5662,2.9530,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,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,1237.0177,1237.0177,1237.0177
 2.5000,1.0000,0.0000,0.0000,,,,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1381.0348,1381.0348,1381.0348
 3.5000,1.0000,0.0000,0.0000,,,,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1375.5352,1375.5352,1375.5352
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
index 85847276acfc6b64da92176db59bf95f6198213e..c0d4d19abebe7ae5af94bd140a86dadaa9972ce1 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.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 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^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]
 1.5000,1.0000,0.0000,0.0000,,,,0,622.2222,45.3199,565.7603,-98.5662,2.9530,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,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,1237.0177,1237.0177,1237.0177
 2.5000,1.0000,0.0000,0.0000,,,,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1381.0348,1381.0348,1381.0348
 3.5000,1.0000,0.0000,0.0000,,,,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1375.5352,1375.5352,1375.5352
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
index 6c68e74d0440ae3b4734960596927ef3d86638ef..4b93bb317ef2012bb87b9dc72f5c1b9469411802 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.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 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^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]
 1.5000,1.0000,0.0000,0.0000,,,,0,622.2222,45.3199,565.7603,-98.5662,2.9530,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,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,1237.0177,1237.0177,1237.0177
 2.5000,1.0000,0.0000,0.0000,,,,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1381.0348,1381.0348,1381.0348
 3.5000,1.0000,0.0000,0.0000,,,,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1375.5352,1375.5352,1375.5352
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
index 63d3b4f427ba900ec637f71a939348a57c882493..121d9f5f90918ed186cc7e39f117234a4e3a50db 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.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^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]
 1.5000,1.0000,,0.0000,,,,0,622.2222,45.3199,565.7603,-98.5662,2.9530,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,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,1237.0177,1.2370,1.2370
 2.5000,1.0000,,0.0000,,,,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1381.0348,1.3810,1.3810
 3.5000,1.0000,,0.0000,,,,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1375.5352,1.3755,1.3755
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
index 017fa89f1bbeaccde28445c83467ef5c142345a5..1c7a66d120b972f0e31b44b3c07218f53b404845 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.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^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]
 1.5000,1.0000,,0.0000,,,,0,622.2222,45.3199,565.7603,-98.5662,2.9530,36.8644,-6.4225,-0.8491,0.0000,-0.7024,0.7024,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,1237.0177,1.2370,1.2370
 2.5000,1.0000,,0.0000,,,,0,600.0000,61.8987,586.7144,-100.9497,3.8892,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1381.0348,1.3810,1.3810
 3.5000,1.0000,,0.0000,,,,0,600.0000,61.3443,586.7144,-100.9497,3.8544,36.8644,-6.3429,0.0000,0.0000,-1.4047,1.4047,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,1375.5352,1.3755,1.3755
diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod b/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
index 3f467a0533e329e985f386cb99833b70181652cc..4e6d783d3f4bb626b8d76b1bce0b2aa922e29f20 100644
--- a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
+++ b/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
@@ -1,2 +1,2 @@
-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^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]
 1.5000,1.0000,,,,,,2,1748.3243,484.1551,838.1341,-102.6453,88.6411,153.4490,-18.7927,0.0000,88.6411,0.0000,0.0000,0.0000,769.6618,-24.5459,0.0000,794.2077,0.0000,794.2077,21.2575,,,89.0198,,,,,,,18148.2208,18.1482,18.1482
diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod b/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod
index 9d681e785186a6d960da24096d4eca2f4e520f7a..5d4799ac9f1da8c734d57df746ce78e2bf451b32 100644
--- a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod
+++ b/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.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^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]
 0.6000,0.4000,,,,,,2,602.0000,19.6940,556.6000,-87.2543,1.2415,35.0888,-5.5006,0.0000,-0.3633,0.0000,0.0000,1.6048,-3.1542,-4.0193,0.0000,0.8651,0.0000,0.8651,0.8651,,,0.0000,,,,,,,912.3793,0.9124,0.9124
 1.0000,0.4000,,,,,,2,602.0000,23.7343,556.6000,-87.2543,1.4962,35.0888,-5.5006,0.0000,-0.1107,0.0000,0.0000,1.6070,-0.1107,-0.1410,0.0000,0.0302,0.0000,0.0302,0.0302,,,0.0000,,,,,,,968.0253,0.9680,0.9680
 1.4000,0.4000,,,,,,2,602.0000,23.7145,556.6000,-87.2543,1.4950,35.0888,-5.5006,0.0000,-0.1107,0.0000,0.0000,1.6057,-0.1107,-0.1410,0.0000,0.0302,0.0000,0.0302,0.0302,,,0.0000,,,,,,,967.7526,0.9678,0.9678