diff --git a/Documentation/User Manual/5-input-and-output-files/VSUM.md b/Documentation/User Manual/5-input-and-output-files/VSUM.md
index cf7499f1eb86d5361eeb82f74b1995b8bd6f3f9c..2f9d695576e6d3b0d75ad366d4521ab81ea23103 100644
--- a/Documentation/User Manual/5-input-and-output-files/VSUM.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md	
@@ -64,6 +64,7 @@ The .vsum file includes total / average results for each calculation run in one
 | E_air                                  | [kWh]                                              | Total work of air resistance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | E_roll                                 | [kWh]                                              | Total work of rolling resistance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | E_grad                                 | [kWh]                                              | Total work of gradient resistance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| E_aux_ESS_missing | [kWh] | Total work of auxiliaries missing due to ICE off during ESS events. Used for fuel consumption correction in the post-processing. |
 | n_EM_\<POS>-em_avg                     | [rpm]                                              | Average angular speed of the electric machine                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | E_EM_\<POS>-em_drive                   | [kWh]                                              | Mechanical energy at the electric motor shaft applied by the electric machine at position *POS* to drive the vehicle                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | E_EM_\<POS>-em_gen                     | [kWh]                                              | Mechanical energy at the electric motor shaft recuperated by the electric machine at position *POS*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index b91901864a48c694d6008a066918a5f80c6f9812..8b613d79b179aa919a43779509b90cf953ac3157 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 						airDragArea,
 						DeclarationDataAdapterHeavyLorry.GetDeclarationAirResistanceCurve(
 							GetAirdragParameterSet(
-								data.VehicleCategory, data.AxleConfiguration, data.Components.AxleWheels.AxlesEngineering.Count), airDragArea,
+								data.VehicleCategory, data.AxleConfiguration, data.Components.AxleWheels.AxlesEngineering.Count, data.GrossVehicleMassRating), airDragArea,
 							height),
 						CrossWindCorrectionMode.DeclarationModeCorrection);
 					break;
@@ -155,13 +155,18 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			return retVal;
 		}
 
-		private string GetAirdragParameterSet(VehicleCategory vehicleCategory, AxleConfiguration axles, int numAxles)
+		private string GetAirdragParameterSet(VehicleCategory vehicleCategory, AxleConfiguration axles, int numAxles,
+			Kilogram tpmlm)
 		{
 			//TODO: check if is i
 			switch (vehicleCategory) {
 				case VehicleCategory.Van:
 					return "MediumLorriesVan";
-				case VehicleCategory.RigidTruck: return numAxles > axles.NumAxles() ? "RigidTrailer" : "RigidSolo";
+				case VehicleCategory.RigidTruck:
+					if (tpmlm.IsSmallerOrEqual(7400)) {
+						return "MediumLorriesRigid";
+					}
+					return numAxles > axles.NumAxles() ? "RigidTrailer" : "RigidSolo";
 				case VehicleCategory.Tractor: return "TractorSemitrailer";
 				case VehicleCategory.CityBus:
 				//case VehicleCategory.InterurbanBus:
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index 9124477852578004a677c0b244ee1e90689f4fea..23ed1758d98fe17ba51558dc0ad4d457e6831405 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			protected internal set => throw new System.NotImplementedException();
 		}
 
-		public override GearshiftPosition NextGear => _strategy.NextGear;
+		public override GearshiftPosition NextGear => _strategy?.NextGear ?? _gear;
 
 		#region Overrides of AbstractGearbox<ATGearboxState>
 
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 8d6e194332a8568d694f004b2e0da85106eb96e6..3465fa90b62566887383800703b6b2e56988954a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -343,6 +343,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				CurrentState.ExcessiveDragPower = drivetrainPower -
 												(DataBus.EngineInfo.EngineDragPower(avgAngularSpeed) - preExistingAuxPower) - DataBus.Brakes.BrakePower;
 			}
+
+			if (!dryRun && DataBus.DriverInfo.DrivingAction == DrivingAction.Brake && torquePowerTrain.IsGreater(0) &&
+				DataBus.GearboxInfo.Gear.TorqueConverterLocked.HasValue &&
+				!DataBus.GearboxInfo.Gear.TorqueConverterLocked.Value) {
+				CurrentState.ExcessiveDragPower = 0.SI<Watt>();
+			}
 			if (!dryRun && DataBus.DriverInfo.DrivingAction != DrivingAction.Brake) {
 				CurrentState.ExcessiveDragPower = 0.SI<Watt>();
 			}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 15b82d6ad15596be3e82dde2705b63221ec5c65d..84662db82143d49bd6b92da8b2fb7d679134cbf4 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -954,9 +954,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						debug.Add(new { action = "first:(Underload & Overspeed)-> Coast", second });
 						second = HandleCoastAfterUnderloadWithOverspeed(absTime, ds, gradient, velocityWithOverspeed, debug, second);
 					} else {
-						second = DataBus.GearboxInfo.GearboxType.AutomaticTransmission()
-							? Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient, overrideAction: DrivingAction.Accelerate)
-							: Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient);
+						// overrideAction: in case of hybrids with an AT gearbox after an underload we search for braking power because the torque converter
+						// may be in creeping condition (e.g. engine propels but torque converter is below drag. -> engine propells and remaining power is 
+						// dissipated in brakes.
+						// in order that the hybrid controller still selects a solution where the EM propells as well, the brake action announces the 
+						// accelerate action.
+						// unfortunately, this causes issues for P1 hybrid configurations with AT gearbox in torque converter gear. If the EM propells, the torque
+						// converter cannot find an operating point close to the drag point. therefore, do not announce the different action except for driving off from
+						// standstill.
+						var overrideAction = DataBus.GearboxInfo.GearboxType.AutomaticTransmission() 
+											&& (DataBus.GearboxInfo.Gear.TorqueConverterLocked.HasValue && !DataBus.GearboxInfo.Gear.TorqueConverterLocked.Value)
+											&& (DataBus.ElectricMotorInfo(PowertrainPosition.HybridP1) == null || DataBus.VehicleInfo.VehicleStopped)
+							? DrivingAction.Accelerate
+							: (DrivingAction?)null;
+						second = Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient,
+							overrideAction: overrideAction);
 						debug.Add(new { action = "first:(Underload & !Overspeed) -> Brake", second });
 					}
 					break;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
index 51e40557707016a0c9deb5720d2801f0c7a63197..722129bad53130f0d8d96b20cfae700054e4f59b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
@@ -916,16 +916,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			//var maxTorque = DataBus.e
 			var tcOp = DataBus.TorqueConverterInfo.CalculateOperatingPoint(DataBus.EngineInfo.EngineIdleSpeed * 1.01, response.Gearbox.InputSpeed);
 
-			if (!tcOp.Item2.IsBetween(dragTorque - inertiaTq - auxTqDemand, maxTorque - inertiaTq - auxTqDemand)) {
+			//if (tcOp.Item2.IsBetween(dragTorque - inertiaTq - auxTqDemand, maxTorque - inertiaTq - auxTqDemand)) {
 				_previousGearboxDisengaged = DataBus.GearboxInfo.DisengageGearbox;
 				DataBus.GearboxCtl.DisengageGearbox = true;
 				operatingPoint = SearchBrakingPower(
 					absTime, operatingPoint.SimulationDistance, gradient,
 					operatingPoint.Acceleration, response);
 				return operatingPoint;
-			}
+			//}
 
-			return null;
+			//return null;
 		}
 
 		private OperatingPoint AdaptDecelerationToTargetDistance(Meter ds, MeterPerSecond nextTargetSpeed,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
index 1d5fc0d48906d1e4839b9bc10e5e2cdfaf20c7c3..d0288d50b286b2192aaa82cb6419bba0d24b776d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
@@ -103,6 +103,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						TorqueOutDemand = outTorque,
 						PowerRequest = outTorque * 0.RPMtoRad(), // outAngularVelocity,
 						DynamicFullLoadPower = 0.SI<Watt>(),
+						DynamicFullLoadTorque = 0.SI<NewtonMeter>(),
 						DragPower = 0.SI<Watt>(),
 						EngineSpeed = 0.RPMtoRad(), // outAngularVelocity, // 0.RPMtoRad(),
 						AuxiliariesPowerDemand = 0.SI<Watt>(),
@@ -120,6 +121,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					PowerRequest = 0.SI<Watt>(),
 					DynamicFullLoadPower = 0.SI<Watt>(),
 					TotalTorqueDemand = 0.SI<NewtonMeter>(),
+					DynamicFullLoadTorque = 0.SI<NewtonMeter>(),
 					DragPower = 0.SI<Watt>(),
 					DragTorque = 0.SI<NewtonMeter>(),
 					EngineSpeed = 0.RPMtoRad(),
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
index c1dd613b3525b1a1e875f2eca25483722511b2ef..1008e5710834063b6f7a61b844bca297a81a22a2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
@@ -144,7 +144,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					retVal1.ElectricMotor.InertiaTorque = engineResponse.ElectricMotor.InertiaTorque;
 					retVal1.ElectricMotor.TotalTorqueDemand = engineResponse.ElectricMotor.TotalTorqueDemand;
 
-					return retVal1;
+                    retVal1.ElectricMotor.MaxDriveTorque = engineResponse.ElectricMotor.MaxDriveTorque;
+                    retVal1.ElectricMotor.MaxDriveTorqueEM = engineResponse.ElectricMotor.MaxDriveTorqueEM;
+                    retVal1.ElectricMotor.MaxRecuperationTorque = engineResponse.ElectricMotor.MaxRecuperationTorque;
+                    retVal1.ElectricMotor.MaxRecuperationTorqueEM = engineResponse.ElectricMotor.MaxRecuperationTorqueEM;
+                    retVal1.ElectricMotor.AngularVelocity = engineResponse.ElectricMotor.AngularVelocity;
+                    retVal1.ElectricMotor.ElectricMotorPowerMech = engineResponse.ElectricMotor.ElectricMotorPowerMech;
+                    return retVal1;
 				}
 			}
 
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index a3662ec10e6493a6fc2d353186bb0189255a8fab..b451cb4a44ea43c7196380ccaf98e3932148b756 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -683,6 +683,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			if (best == null) {
 				best = ResponseEmOff;
 				best.ICEOff = false;
+				if (AllowEmergencyShift && GearList.HasSuccessor(currentGear)) {
+					var testResponse = GetEmOffResultEntry(absTime, dt, outTorque, outAngularVelocity, currentGear);
+					if (testResponse.Response.Engine.EngineSpeed.IsGreaterOrEqual(ModelData.EngineData.FullLoadCurves[0]
+						.RatedSpeed)) {
+						best.Gear = GearList.Successor(currentGear);
+					}
+				}
 			}
 
 			var retVal = CreateResponse(best, currentGear);
@@ -1743,13 +1750,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 				return null;
 			}
 
-			if (StrategyParameters.MaxPropulsionTorque != null && ModelData.GearboxData.Type.AutomaticTransmission()) {
-				var maxTqNextGear =
-					StrategyParameters.MaxPropulsionTorque.FullLoadDriveTorque(emOffEntry.Response.Gearbox.InputSpeed);
-				if (((emOffEntry.Response.Gearbox.InputTorque - maxTqNextGear) * emOffEntry.Response.Gearbox.InputSpeed).IsGreater(0, Constants.SimulationSettings.LineSearchTolerance)) {
-					return null;
-				}
-			}
+			//if (StrategyParameters.MaxPropulsionTorque != null && ModelData.GearboxData.Type.AutomaticTransmission()) {
+			//	var maxTqNextGear =
+			//		StrategyParameters.MaxPropulsionTorque.FullLoadDriveTorque(emOffEntry.Response.Gearbox.InputSpeed);
+			//	if (!AllowEmergencyShift && ((emOffEntry.Response.Gearbox.InputTorque - maxTqNextGear) * emOffEntry.Response.Gearbox.InputSpeed).IsGreater(0, Constants.SimulationSettings.LineSearchTolerance)) {
+			//		return null;
+			//	}
+			//}
 
 			CalculateCosts(emOffEntry.Response, dt, emOffEntry, allowICEOff, dryRun);
 
@@ -1796,8 +1803,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			var maxEmTorque = firstResponse.ElectricMotor.MaxDriveTorque ?? 0.SI<NewtonMeter>();
 			var maxU = allowIceOff
 				? -1.0
-				: Math.Min(maxEmTorque / emTqReq, -1.0);
-			if (DataBus.DriverInfo.DrivingAction == DrivingAction.Brake) {
+				: Math.Min(maxEmTorque.Value() / emTqReq.Value(), -1.0);
+			if (DataBus.DriverInfo.DrivingAction == DrivingAction.Brake || double.IsNaN(maxU)) {
+				maxU = 0;
+			}
+
+			if (emTqReq.IsEqual(0, 1)) {
 				maxU = 0;
 			}
 
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
index b964fb5da2799de934b9001b2da63e34dc73c093..5e3c0639d4a77e09646e9e5bf44b6621b5c274d9 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
@@ -319,7 +319,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 
 		[TestCase]
-		public void Class5_PCC123_CaseE() => TestPCC(MethodBase.GetCurrentMethod().Name,
+		public void Class5_PCC123_CaseE_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
 			(0, 689, OutsideSegment, Accelerate),         // len: 689m
 			(689, 2066, WithinSegment, Accelerate),       // len: 1377m
 			(2066, 2377, UseCase1, Coast),                // len: 311m
@@ -331,7 +331,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 
 		[TestCase]
-		public void Class5_PCC123_CaseF() => TestPCC(MethodBase.GetCurrentMethod().Name,
+		public void Class5_PCC123_CaseF_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
 			(0, 700, OutsideSegment, Accelerate),         // len: 700m
 			(700, 2066, WithinSegment, Accelerate),       // len: 1366m
 			(2066, 2400, UseCase1, Coast),                // len: 334m
@@ -340,7 +340,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(3283, 1e6, OutsideSegment, Accelerate));
 
 		[TestCase]
-		public void Class5_PCC123_CaseG() => TestPCC(MethodBase.GetCurrentMethod().Name,
+		public void Class5_PCC123_CaseG_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
 			(0, 3944, OutsideSegment, Accelerate),        // len: 3944m
 			(3944, 5076, WithinSegment, Accelerate),      // len: 1132m
 			(5076, 5899, UseCase1, Coast),                // len: 823m
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
index e61588d3c9a29eaca2c3cb3a663a2cd6055cf930..39251c77028b1d30074beb826b36537dbaa4e58e 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
@@ -134,19 +134,21 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4881, 4887, OutsideSegment, Roll),           // len: 6m
 			(4887, 4903, OutsideSegment, Accelerate),     // len: 16m
 			(4903, 4909, OutsideSegment, Roll),           // len: 6m
-			(4909, 4955, OutsideSegment, Accelerate),     // len: 46m
-			(4955, 4962, OutsideSegment, Roll),           // len: 7m
-			(4962, 4983, OutsideSegment, Accelerate),     // len: 21m
-			(4983, 4991, OutsideSegment, Roll),           // len: 8m
-			(4991, 5015, OutsideSegment, Accelerate),     // len: 24m
-			(5015, 5025, OutsideSegment, Roll),           // len: 10m
-			(5025, 5053, OutsideSegment, Accelerate),     // len: 28m
-			(5053, 5065, OutsideSegment, Roll),           // len: 12m
-			(5065, 5457, OutsideSegment, Accelerate),     // len: 392m
-			(5457, 5564, OutsideSegment, Coast),          // len: 107m
-			(5564, 6081, OutsideSegment, Brake),          // len: 517m
-			(6081, 6366, OutsideSegment, Coast),          // len: 285m
-			(6366, 1e6, OutsideSegment, Accelerate));
+			(4909, 5041, OutsideSegment, Accelerate),     // len: 46m
+            //(4955, 5041, OutsideSegment, Roll),           // len: 7m
+                                                          //(4962, 4983, OutsideSegment, Accelerate),     // len: 21m
+                                                          //(4983, 4991, OutsideSegment, Roll),           // len: 8m
+                                                          //(4991, 5015, OutsideSegment, Accelerate),     // len: 24m
+                                                          //(5015, 5025, OutsideSegment, Roll),           // len: 10m
+            (5041, 5054, OutsideSegment, Roll),     // len: 28m
+            (5054, 5087, OutsideSegment, Accelerate),           // len: 12m
+            (5087, 5102, OutsideSegment, Roll),     // len: 392m
+			(5102, 5437, OutsideSegment, Accelerate),
+			(5437, 5532, OutsideSegment, Coast),          // len: 107m
+			(5564, 6084, OutsideSegment, Brake)          // len: 517m
+			//(6081, 6366, OutsideSegment, Coast),          // len: 285m
+			//(6366, 1e6, OutsideSegment, Accelerate)
+			);
 
 		[TestCase]
 		public void Class5_E2_NoADAS_CrestCoast1() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
@@ -170,18 +172,18 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase]
 		public void Class5_E2_NoADAS_CrestCoast2() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
-			(0, 0, OutsideSegment, Halt),                 // len: 0m
-			(0, 13, OutsideSegment, Accelerate),          // len: 13m
-			(13, 18, OutsideSegment, Roll),               // len: 5m
-			(18, 36, OutsideSegment, Accelerate),         // len: 18m
-			(36, 43, OutsideSegment, Roll),               // len: 7m
-			(43, 78, OutsideSegment, Accelerate),         // len: 35m
-			(78, 87, OutsideSegment, Roll),               // len: 9m
-			(87, 169, OutsideSegment, Accelerate),        // len: 82m
-			(169, 182, OutsideSegment, Roll),             // len: 13m
-			(182, 278, OutsideSegment, Accelerate),       // len: 96m
-			(278, 295, OutsideSegment, Roll),             // len: 17m
-			(295, 3615, OutsideSegment, Accelerate),      // len: 3320m
+			//(0, 0, OutsideSegment, Halt),                 // len: 0m
+			//(0, 13, OutsideSegment, Accelerate),          // len: 13m
+			//(13, 18, OutsideSegment, Roll),               // len: 5m
+			//(18, 36, OutsideSegment, Accelerate),         // len: 18m
+			//(36, 43, OutsideSegment, Roll),               // len: 7m
+			//(43, 78, OutsideSegment, Accelerate),         // len: 35m
+			//(78, 87, OutsideSegment, Roll),               // len: 9m
+			//(87, 169, OutsideSegment, Accelerate),        // len: 82m
+			//(169, 182, OutsideSegment, Roll),             // len: 13m
+			//(182, 278, OutsideSegment, Accelerate),       // len: 96m
+			//(278, 295, OutsideSegment, Roll),             // len: 17m
+			(442, 3615, OutsideSegment, Accelerate),      // len: 3320m
 			(3615, 4248, OutsideSegment, Coast),          // len: 633m
 			(4248, 4509, OutsideSegment, Brake),          // len: 261m
 			(4509, 4717, OutsideSegment, Coast),          // len: 208m
@@ -280,15 +282,15 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4881, 4887, WithinSegment, Roll),            // len: 6m
 			(4887, 4903, WithinSegment, Accelerate),      // len: 16m
 			(4903, 4909, WithinSegment, Roll),            // len: 6m
-			(4909, 4955, WithinSegment, Accelerate),      // len: 46m
-			(4955, 4962, WithinSegment, Roll),            // len: 7m
-			(4962, 4983, WithinSegment, Accelerate),      // len: 21m
-			(4983, 4991, WithinSegment, Roll),            // len: 8m
-			(4991, 5015, WithinSegment, Accelerate),      // len: 24m
-			(5015, 5025, WithinSegment, Roll),            // len: 10m
-			(5025, 5053, WithinSegment, Accelerate),      // len: 28m
-			(5053, 5065, WithinSegment, Roll),            // len: 12m
-			(5065, 5356, WithinSegment, Accelerate),      // len: 291m
+			(4909, 5041, WithinSegment, Accelerate),      // len: 46m
+			(5041, 5054, WithinSegment, Roll),            // len: 7m
+			(5054, 5087, WithinSegment, Accelerate),      // len: 21m
+			(5087, 5102, WithinSegment, Roll),            // len: 8m
+			//(4991, 5015, WithinSegment, Accelerate),      // len: 24m
+			//(5015, 5025, WithinSegment, Roll),            // len: 10m
+			//(5025, 5053, WithinSegment, Accelerate),      // len: 28m
+			//(5053, 5065, WithinSegment, Roll),            // len: 12m
+			(5102, 5356, WithinSegment, Accelerate),      // len: 291m
 			(5356, 5684, UseCase2, Coast),                // len: 328m
 			(5684, 6135, WithinSegment, Coast),           // len: 451m
 			(6135, 6473, OutsideSegment, Coast),          // len: 338m
@@ -296,18 +298,18 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase]
 		public void Class5_E2_PCC123_CrestCoast1() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
-			(0, 0, OutsideSegment, Halt),                 // len: 0m
-			(0, 13, OutsideSegment, Accelerate),          // len: 13m
-			(13, 18, OutsideSegment, Roll),               // len: 5m
-			(18, 36, OutsideSegment, Accelerate),         // len: 18m
-			(36, 43, OutsideSegment, Roll),               // len: 7m
-			(43, 78, OutsideSegment, Accelerate),         // len: 35m
-			(78, 87, OutsideSegment, Roll),               // len: 9m
-			(87, 169, OutsideSegment, Accelerate),        // len: 82m
-			(169, 182, OutsideSegment, Roll),             // len: 13m
-			(182, 278, OutsideSegment, Accelerate),       // len: 96m
-			(278, 295, OutsideSegment, Roll),             // len: 17m
-			(295, 3809, OutsideSegment, Accelerate),      // len: 3514m
+			//(0, 0, OutsideSegment, Halt),                 // len: 0m
+			//(0, 13, OutsideSegment, Accelerate),          // len: 13m
+			//(13, 18, OutsideSegment, Roll),               // len: 5m
+			//(18, 36, OutsideSegment, Accelerate),         // len: 18m
+			//(36, 43, OutsideSegment, Roll),               // len: 7m
+			//(43, 78, OutsideSegment, Accelerate),         // len: 35m
+			//(78, 87, OutsideSegment, Roll),               // len: 9m
+			//(87, 169, OutsideSegment, Accelerate),        // len: 82m
+			//(169, 182, OutsideSegment, Roll),             // len: 13m
+			//(182, 278, OutsideSegment, Accelerate),       // len: 96m
+			//(278, 295, OutsideSegment, Roll),             // len: 17m
+			(422, 3809, OutsideSegment, Accelerate),      // len: 3514m
 			(3809, 4568, OutsideSegment, Coast),          // len: 759m
 			(4568, 5001, OutsideSegment, Brake),          // len: 433m
 			(5001, 5408, OutsideSegment, Coast),          // len: 407m
@@ -316,18 +318,18 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase]
 		public void Class5_E2_PCC123_CrestCoast2() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
-			(0, 0, OutsideSegment, Halt),                 // len: 0m
-			(0, 13, OutsideSegment, Accelerate),          // len: 13m
-			(13, 18, OutsideSegment, Roll),               // len: 5m
-			(18, 36, OutsideSegment, Accelerate),         // len: 18m
-			(36, 43, OutsideSegment, Roll),               // len: 7m
-			(43, 78, OutsideSegment, Accelerate),         // len: 35m
-			(78, 87, OutsideSegment, Roll),               // len: 9m
-			(87, 169, OutsideSegment, Accelerate),        // len: 82m
-			(169, 182, OutsideSegment, Roll),             // len: 13m
-			(182, 278, OutsideSegment, Accelerate),       // len: 96m
-			(278, 295, OutsideSegment, Roll),             // len: 17m
-			(295, 3615, OutsideSegment, Accelerate),      // len: 3320m
+			//(0, 0, OutsideSegment, Halt),                 // len: 0m
+			//(0, 13, OutsideSegment, Accelerate),          // len: 13m
+			//(13, 18, OutsideSegment, Roll),               // len: 5m
+			//(18, 36, OutsideSegment, Accelerate),         // len: 18m
+			//(36, 43, OutsideSegment, Roll),               // len: 7m
+			//(43, 78, OutsideSegment, Accelerate),         // len: 35m
+			//(78, 87, OutsideSegment, Roll),               // len: 9m
+			//(87, 169, OutsideSegment, Accelerate),        // len: 82m
+			//(169, 182, OutsideSegment, Roll),             // len: 13m
+			//(182, 278, OutsideSegment, Accelerate),       // len: 96m
+			//(278, 295, OutsideSegment, Roll),             // len: 17m
+			(422, 3615, OutsideSegment, Accelerate),      // len: 3320m
 			(3615, 4248, OutsideSegment, Coast),          // len: 633m
 			(4248, 4509, OutsideSegment, Brake),          // len: 261m
 			(4509, 4717, OutsideSegment, Coast),          // len: 208m
@@ -433,15 +435,15 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4881, 4887, WithinSegment, Roll),            // len: 6m
 			(4887, 4903, WithinSegment, Accelerate),      // len: 16m
 			(4903, 4909, WithinSegment, Roll),            // len: 6m
-			(4909, 4955, WithinSegment, Accelerate),      // len: 46m
-			(4955, 4962, WithinSegment, Roll),            // len: 7m
-			(4962, 4983, WithinSegment, Accelerate),      // len: 21m
-			(4983, 4991, WithinSegment, Roll),            // len: 8m
-			(4991, 5015, WithinSegment, Accelerate),      // len: 24m
-			(5015, 5025, WithinSegment, Roll),            // len: 10m
-			(5025, 5053, WithinSegment, Accelerate),      // len: 28m
-			(5053, 5065, WithinSegment, Roll),            // len: 12m
-			(5065, 5356, WithinSegment, Accelerate),      // len: 291m
+			(4909, 5041, WithinSegment, Accelerate),      // len: 46m
+            (5041, 5054, WithinSegment, Roll),            // len: 7m
+            (5054, 5087, WithinSegment, Accelerate),      // len: 21m
+            (5087, 5102, WithinSegment, Roll),            // len: 8m
+			//(4991, 5015, WithinSegment, Accelerate),      // len: 24m
+	          //(5015, 5025, WithinSegment, Roll),            // len: 10m
+	          //(5025, 5053, WithinSegment, Accelerate),      // len: 28m
+	          //(5053, 5065, WithinSegment, Roll),            // len: 12m
+            (5065, 5356, WithinSegment, Accelerate),      // len: 291m
 			(5356, 5684, UseCase2, Coast),                // len: 328m
 			(5684, 5755, WithinSegment, Coast),           // len: 71m
 			(5755, 6080, WithinSegment, Brake),           // len: 325m
@@ -451,18 +453,18 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase]
 		public void Class5_E2_PCC12_CrestCoast1() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
-			(0, 0, OutsideSegment, Halt),                 // len: 0m
-			(0, 13, OutsideSegment, Accelerate),          // len: 13m
-			(13, 18, OutsideSegment, Roll),               // len: 5m
-			(18, 36, OutsideSegment, Accelerate),         // len: 18m
-			(36, 43, OutsideSegment, Roll),               // len: 7m
-			(43, 78, OutsideSegment, Accelerate),         // len: 35m
-			(78, 87, OutsideSegment, Roll),               // len: 9m
-			(87, 169, OutsideSegment, Accelerate),        // len: 82m
-			(169, 182, OutsideSegment, Roll),             // len: 13m
-			(182, 278, OutsideSegment, Accelerate),       // len: 96m
-			(278, 295, OutsideSegment, Roll),             // len: 17m
-			(295, 3809, OutsideSegment, Accelerate),      // len: 3514m
+			//(0, 0, OutsideSegment, Halt),                 // len: 0m
+			//(0, 13, OutsideSegment, Accelerate),          // len: 13m
+			//(13, 18, OutsideSegment, Roll),               // len: 5m
+			//(18, 36, OutsideSegment, Accelerate),         // len: 18m
+			//(36, 43, OutsideSegment, Roll),               // len: 7m
+			//(43, 78, OutsideSegment, Accelerate),         // len: 35m
+			//(78, 87, OutsideSegment, Roll),               // len: 9m
+			//(87, 169, OutsideSegment, Accelerate),        // len: 82m
+			//(169, 182, OutsideSegment, Roll),             // len: 13m
+			//(182, 278, OutsideSegment, Accelerate),       // len: 96m
+			//(278, 295, OutsideSegment, Roll),             // len: 17m
+			(422, 3809, OutsideSegment, Accelerate),      // len: 3514m
 			(3809, 4568, OutsideSegment, Coast),          // len: 759m
 			(4568, 5001, OutsideSegment, Brake),          // len: 433m
 			(5001, 5408, OutsideSegment, Coast),          // len: 407m
@@ -471,18 +473,18 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase]
 		public void Class5_E2_PCC12_CrestCoast2() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
-			(0, 0, OutsideSegment, Halt),                 // len: 0m
-			(0, 13, OutsideSegment, Accelerate),          // len: 13m
-			(13, 18, OutsideSegment, Roll),               // len: 5m
-			(18, 36, OutsideSegment, Accelerate),         // len: 18m
-			(36, 43, OutsideSegment, Roll),               // len: 7m
-			(43, 78, OutsideSegment, Accelerate),         // len: 35m
-			(78, 87, OutsideSegment, Roll),               // len: 9m
-			(87, 169, OutsideSegment, Accelerate),        // len: 82m
-			(169, 182, OutsideSegment, Roll),             // len: 13m
-			(182, 278, OutsideSegment, Accelerate),       // len: 96m
-			(278, 295, OutsideSegment, Roll),             // len: 17m
-			(295, 3615, OutsideSegment, Accelerate),      // len: 3320m
+			//(0, 0, OutsideSegment, Halt),                 // len: 0m
+			//(0, 13, OutsideSegment, Accelerate),          // len: 13m
+			//(13, 18, OutsideSegment, Roll),               // len: 5m
+			//(18, 36, OutsideSegment, Accelerate),         // len: 18m
+			//(36, 43, OutsideSegment, Roll),               // len: 7m
+			//(43, 78, OutsideSegment, Accelerate),         // len: 35m
+			//(78, 87, OutsideSegment, Roll),               // len: 9m
+			//(87, 169, OutsideSegment, Accelerate),        // len: 82m
+			//(169, 182, OutsideSegment, Roll),             // len: 13m
+			//(182, 278, OutsideSegment, Accelerate),       // len: 96m
+			//(278, 295, OutsideSegment, Roll),             // len: 17m
+			(422, 3615, OutsideSegment, Accelerate),      // len: 3320m
 			(3615, 4248, OutsideSegment, Coast),          // len: 633m
 			(4248, 4509, OutsideSegment, Brake),          // len: 261m
 			(4509, 4717, OutsideSegment, Coast),          // len: 208m
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index aac17d77d9ec5f5ffa604b83a04bae9d2ed9240e..b7cb025036d80dabbaf52b7fb6796a0836324b71 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-339-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8429,46.6779,15.8669,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,17.6131,,,,198.4411,185.0920,460.8779,,,,24.4129,27.2362,31.9767,32.8306,11.8464,0.3081,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.3147,0.0000,0.0000,1.8501,0.5572,0.0000,5.3389,3.1104,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1125.3166,1796.5316,26.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.402716937557205,,,,,NOT CERTIFIED,N/A,0.975207664829343,,,,,,NOT CERTIFIED,N/A,0.859477814330425,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.1147,20.3233
-#@ SHA256: OwAufCosfR9UhIfddf8oG6zrLGviJ2+EcKgb2vaAkjI=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+12-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8429,46.6779,15.8669,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,17.6131,,,,198.4411,185.0920,460.8779,,,,24.4129,27.2362,31.9767,32.8306,11.8464,0.3081,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.3147,0.0000,0.0000,1.8501,0.5572,0.0000,5.3389,3.1104,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1125.3166,1796.5316,26.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.402716937557205,,,,,NOT CERTIFIED,N/A,0.975207664829343,,,,,,NOT CERTIFIED,N/A,0.859477814330425,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.1147,20.3233
+#@ SHA256: ZKoldmcvwyTUeD69SltWfgFu/qkVngORFM4MquEhWjw=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index 0afbba8fa2956c6c8781e775666043dca577b964..b8c4057c3495df6388d0e392ed463a8b0d76137d 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-340-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8429,46.6779,15.8669,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,17.6131,,,,198.4411,185.0920,460.8779,,,,24.4129,27.2362,31.9767,32.8306,11.8464,0.3081,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.3147,0.0000,0.0000,1.8501,0.5572,0.0000,5.3389,3.1104,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1125.3166,1796.5316,26.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.402716937557205,,,,,NOT CERTIFIED,N/A,0.975207664829343,,,,,,NOT CERTIFIED,N/A,0.859477814330425,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.1147,20.3233
-#@ SHA256: Tsenkc3IXikQIOzRERDqFzPXf6zVa0aQ6AjP1rbtnuM=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+4-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8429,46.6779,15.8669,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,0.0000,0.0000,6873.1041,147.2453,6873.1041,147.2453,17.6131,,,,198.4411,185.0920,460.8779,,,,24.4129,27.2362,31.9767,32.8306,11.8464,0.3081,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.3147,0.0000,0.0000,1.8501,0.5572,0.0000,5.3389,3.1104,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3217,-0.3296,23.0947,22.7868,39.7229,80.5095,1.1306,1.6261,1125.3166,1796.5316,26.0000,14.3957,3.5412,0.0000,0.0000,40.0308,0.2790,N/A,0.402716937557205,,,,,NOT CERTIFIED,N/A,0.975207664829343,,,,,,NOT CERTIFIED,N/A,0.859477814330425,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.1147,20.3233
+#@ SHA256: FbRyP2r9OKOp6iazfylB/mcQqejDikBKItQ6NGaihf4=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
index 0d7f3740c90431df2dad00d0a943a5ae56244b7e..cc15e8d42babe24f86d26312face986086bdf892 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index afba626d9628a929b9984bc54e1d6ef9e56828f1..2a9b040d412ec9ed958e5323f87f3abc4ba7e302 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-335-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8707,46.7549,15.8669,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,6868.6451,146.9075,17.5727,,,,200.0441,184.7130,459.8203,,,,24.4708,27.2244,32.0577,32.7847,11.8298,0.2623,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.0000,0.0000,0.3221,0.0000,0.0000,1.8505,0.5444,0.0000,5.3545,3.1155,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1081.4039,1962.3354,23.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.402415007697477,,,,,NOT CERTIFIED,N/A,0.974346409786707,,,,,,NOT CERTIFIED,N/A,0.857651852112788,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
-#@ SHA256: +dXvsN3p54RFjsYPF0SIoKwJTeqtjY8ibgVr3m1xSYs=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+7-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8707,46.7549,15.8669,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,0.0000,0.0000,6868.6451,146.9075,6868.6451,146.9075,17.5727,,,,200.0441,184.7130,459.8203,,,,24.4708,27.2244,32.0577,32.7847,11.8298,0.2623,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.0000,0.0000,0.3221,0.0000,0.0000,1.8505,0.5444,0.0000,5.3545,3.1155,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1081.4039,1962.3354,23.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.402415007697477,,,,,NOT CERTIFIED,N/A,0.974346409786707,,,,,,NOT CERTIFIED,N/A,0.857651852112788,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+#@ SHA256: pW5a/XmdXEjdGj8cl3O8mBe5378IkvRYRQQPHm+LMNk=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
index 7efbb66be7b4da845e071b6c5b0d4f2861a156eb..f9ecbaa77f6aaa534281cd9211334de3cd944913 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
-332-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,,,,379.0000,2.8864,27.4168,0.0036,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,9826.4907,358.4119,42.8722,8.9317,,,184.2977,172.6278,1121.8292,233.7144,,,11.9262,40.8256,44.6299,47.9375,5.0468,0.3482,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.4224,10.4559,0.2655,0.0000,0.0000,0.0944,2.7056,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,965.0251,1657.1120,25.0000,20.0528,0.0000,0.0000,0.0000,33.7731,0.0000,N/A,0.411293491390796,Standard values,,0.924436642787585,0.653870851596439,NOT CERTIFIED,N/A,0.947609825163379,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
-#@ SHA256: YWd6r6E+/XnbIQRwvxaxM/UC5C5fWZGCn8MHHmkpKrs=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
+3-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,3.2500,-,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,,,,379.0000,2.8864,27.4168,0.0036,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,0.0000,0.0000,9826.4907,358.4119,9826.4907,358.4119,42.8722,8.9317,,,184.2977,172.6278,1121.8292,233.7144,,,11.9262,40.8256,44.6299,47.9375,5.0468,0.3482,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.4224,10.4559,0.2655,0.0000,0.0000,0.0944,2.7056,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,965.0251,1657.1120,25.0000,20.0528,0.0000,0.0000,0.0000,33.7731,0.0000,N/A,0.411293491390796,Standard values,,0.924436642787585,0.653870851596439,NOT CERTIFIED,N/A,0.947609825163379,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+#@ SHA256: YsvZFQwaZwtLMftjYj7BpxlWNpLY4WhR1di0iFCP4Dk=
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 b5d3ced81a7d8317bf42928ddbc361b47b5f19d3..8df17f3236462fa078c246652178ff2892f3b51f 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_aux_el [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],T_gbx_in [Nm],TCnu,TCmu,T_TC_out [Nm],n_TC_out [rpm],T_TC_in [Nm],n_TC_in [rpm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,277.3408,1153.2448,-148.2740,19.0176,79.0795,97.4732,-10.1674,5.1740,13.8436,0.0000,7.3707,6.4729,0.0000,,6.4729,0.0000,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,1180.1884,0.11790271977492,3.35677824180064,1180.1884,88.3818,201.8858,749.6162,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,4439.8557,4439.8557,4439.8557,4439.8557,1
 2.5000,1.0000,1.7083,4.5500,2.7000,1.0278,-0.3000,-0.0022,1,0,929.2011,641.6116,1756.3494,-156.1061,62.4325,170.9028,206.2703,-15.1900,13.9075,48.5249,0.0000,18.1096,30.4153,0.0000,,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,1950.0842,0.188943184948778,2.78845452040978,1950.0842,209.4976,498.6853,1108.7861,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,12171.3745,12171.3745,12171.3745,12171.3745,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
index 488d19c4862357e0ef5b48031f44eb4ce58ab212..8078bdc5797c0987d67a008518330662e04c73b2 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-333-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,,,,272.0000,1.0228,13.5366,-0.0054,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,6837.3747,505.1016,60.4189,12.5873,,,230.0695,180.5777,1580.9681,329.3684,,,5.1887,22.5565,25.2957,29.3232,2.2155,0.3043,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0756,23.4571,0.4075,0.0000,0.0000,0.0418,1.0056,0.0000,0.0337,0.3585,-0.0001,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.7880,-0.8016,23.8971,23.1618,19.1176,40.6000,1.7751,1.3056,982.5183,1857.4892,45.0000,33.8235,1.1029,0.0000,0.0000,33.8235,0.9202,N/A,0.361573501631451,Standard values,,0.969380030000224,0.835439021277848,NOT CERTIFIED,N/A,0.830056311252242,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.4559,14.3382,13.6029,5.1471,0.0000
-#@ SHA256: 5npDBC/LKXIYOPqOWHPENPyY9rQ4bbWuDWc71H7Y+/Y=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+8-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,3.2500,-,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,,,,272.0000,1.0228,13.5366,-0.0054,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,0.0000,0.0000,6837.3747,505.1016,6837.3747,505.1016,60.4189,12.5873,,,230.0695,180.5777,1580.9681,329.3684,,,5.1887,22.5565,25.2957,29.3232,2.2155,0.3043,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0756,23.4571,0.4075,0.0000,0.0000,0.0418,1.0056,0.0000,0.0337,0.3585,-0.0001,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.7880,-0.8016,23.8971,23.1618,19.1176,40.6000,1.7751,1.3056,982.5183,1857.4892,45.0000,33.8235,1.1029,0.0000,0.0000,33.8235,0.9202,N/A,0.361573501631451,Standard values,,0.969380030000224,0.835439021277848,NOT CERTIFIED,N/A,0.830056311252242,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.4559,14.3382,13.6029,5.1471,0.0000
+#@ SHA256: kiC27IHIHHcqSSg9sr56Tp1vYTnDoglV7MTRV1CGY3s=
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 f4e3990c59d069df17c414522e543e8f69135c21..ca4fa769cc605df193885044e87bf4f2d1f78a31 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_aux_el [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],T_gbx_in [Nm],TCnu,TCmu,T_TC_out [Nm],n_TC_out [rpm],T_TC_in [Nm],n_TC_in [rpm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,222.0459,1205.4567,-148.4009,15.8158,85.8616,105.8467,-10.5702,6.8123,9.0035,0.0000,4.0677,4.9358,0.0000,,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,316.9373,0.341895004111496,1.4781049958885,316.9373,273.6336,126.4046,800.3440,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,3965.8897,3965.8897,3965.8897,3965.8897,1
 2.5000,1.0000,1.5833,4.4500,2.3000,1.1944,-0.3000,-0.0019,1,0,1053.6257,569.4243,1892.6600,-165.0944,62.8277,208.8274,253.7715,-18.2158,22.2413,40.5863,0.0000,5.4404,35.1459,0.0000,,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,633.9352,0.600815024755545,1.22926647772001,633.9352,785.2095,367.8450,1306.9073,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,12357.6853,12357.6853,12357.6853,12357.6853,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index 7dccfac598996ac86d0fdefc5e75438b16498d9c..a3b50a8bf51454c27cccfb2de06f1edc1a872c66 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-334-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8707,46.7549,15.8669,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,6849.5199,146.4984,17.5237,,,,200.2748,185.4878,458.5400,,,,24.4708,27.2244,32.0543,32.7790,11.8277,0.2615,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.0000,0.0000,0.3270,0.0000,0.0000,1.8505,0.5382,0.0000,5.3545,3.1155,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0925,1962.3354,24.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.403468674824705,,,,,NOT CERTIFIED,N/A,0.974323538757316,,,,,,NOT CERTIFIED,N/A,0.85764277102288,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: EbFyUfJeaTvOTnJKDcRwzE1TczzrGlzBR5F4o23r4mY=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+9-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8707,46.7549,15.8669,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,0.0000,0.0000,6849.5199,146.4984,6849.5199,146.4984,17.5237,,,,200.2748,185.4878,458.5400,,,,24.4708,27.2244,32.0543,32.7790,11.8277,0.2615,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0227,0.0000,0.0000,0.3270,0.0000,0.0000,1.8505,0.5382,0.0000,5.3545,3.1155,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0925,1962.3354,24.0000,14.3957,2.0015,0.0000,0.0000,40.1848,0.0000,N/A,0.403468674824705,,,,,NOT CERTIFIED,N/A,0.974323538757316,,,,,,NOT CERTIFIED,N/A,0.85764277102288,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: Pg91MSVSQjNOI4r8Q5Kgq0/tTHt/jYNUwSxL+DSSN60=
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 44ad642aaf1f4de9c031b83916554fd4ba9180df..ccddffa7576ba9d1949b7308ab5c4cdc71f4eff5 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index b1cc02fb31f0cee1eac6d81466dbd2bd87ca7583..9ecc0169f98211ad1477a3828c8a14b586e6c993 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-337-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8716,46.7572,15.8669,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,5421.5698,115.9515,13.8698,,,,199.9311,183.0610,362.9283,,,,15.7991,20.1042,24.0307,25.0986,9.0564,0.3853,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0271,0.0000,0.0000,0.2874,0.0000,0.0000,1.8468,0.8111,0.0000,2.2253,3.1157,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1084.4163,1962.3354,22.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.390300589207987,,,,,NOT CERTIFIED,N/A,0.971965009332477,,,,,,NOT CERTIFIED,N/A,0.832084244014295,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
-#@ SHA256: Y/XDKiqSSluyxeagiL96ps7AQPtIDZcUIC5CcsmOehs=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+10-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8716,46.7572,15.8669,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,0.0000,0.0000,5421.5698,115.9515,5421.5698,115.9515,13.8698,,,,199.9311,183.0610,362.9283,,,,15.7991,20.1042,24.0307,25.0986,9.0564,0.3853,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0271,0.0000,0.0000,0.2874,0.0000,0.0000,1.8468,0.8111,0.0000,2.2253,3.1157,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1084.4163,1962.3354,22.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.390300589207987,,,,,NOT CERTIFIED,N/A,0.971965009332477,,,,,,NOT CERTIFIED,N/A,0.832084244014295,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
+#@ SHA256: zo56jdAGH7bzigmsKKq4J8L34zWSXvEN/ue9RNoPmic=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index e49229e693825499ba17f3fa812f4c33e02fcfb0..44abb0e29dc62def1e8d671f9646d0e9893dd298 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-338-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8716,46.7572,15.8669,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,5409.4966,115.6933,13.8389,,,,200.7881,183.5366,362.1201,,,,15.7991,20.1042,24.0258,25.0944,9.0549,0.3856,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0269,0.0000,0.0000,0.2892,0.0000,0.0000,1.8468,0.8077,0.0000,2.2253,3.1157,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1704,1962.3354,23.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.391106379442543,,,,,NOT CERTIFIED,N/A,0.971936192761897,,,,,,NOT CERTIFIED,N/A,0.832084244014295,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: cG4AEdO+MHOopZE0Gc/Q3Piy6L1iFzY6NNYOadsh2a0=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+2-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8716,46.7572,15.8669,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,0.0000,0.0000,5409.4966,115.6933,5409.4966,115.6933,13.8389,,,,200.7881,183.5366,362.1201,,,,15.7991,20.1042,24.0258,25.0944,9.0549,0.3856,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0269,0.0000,0.0000,0.2892,0.0000,0.0000,1.8468,0.8077,0.0000,2.2253,3.1157,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1704,1962.3354,23.0000,14.3957,0.7698,0.0000,0.0000,40.1848,0.0000,N/A,0.391106379442543,,,,,NOT CERTIFIED,N/A,0.971936192761897,,,,,,NOT CERTIFIED,N/A,0.832084244014295,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: hMajHQAXca1koITz3IPdVYXHF1oorUJt74ymWwVuDEg=
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 e202dad6fb42698f4411476f5f5c7e026c8912b4..91e61c1ef2304254c207da5089c7ef997fc5ea31 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,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 0b0baa9159b8fc4033a6a906116e833fb204ecd7..082d5c11ea200826fa8937e283f4f77746ee8812 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,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 0c910ea5a3027ce5ad9711d14852e0f54f533599..ff30e12dca8decd4529137d24982875d207f6517 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
index 2b23dc03dfe8438575320c114e55db036591b7dc..c63f6f899a5e738ed75ef566a3c8bff53025b4f0 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-336-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8386,46.6659,15.8669,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,6849.7433,146.7826,17.5577,,,,199.3799,184.3349,459.4296,,,,24.4142,27.1997,31.9532,32.7170,11.8054,0.2756,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.0000,0.0000,0.3229,0.0000,0.0000,1.8481,0.5672,0.0000,5.3401,3.1096,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3201,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.9377,1701.8773,22.0000,14.3957,3.1563,0.0000,0.0000,39.5689,0.2450,N/A,0.402692750162188,,,,,NOT CERTIFIED,N/A,0.974012575676176,,,,,,NOT CERTIFIED,N/A,0.858794922444015,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
-#@ SHA256: vZeusRo3FELbu1bgX3ScmXFMs51iTB6V1RgOHzm0sSU=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+6-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,,,1299.0000,16.8386,46.6659,15.8669,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,0.0000,0.0000,6849.7433,146.7826,6849.7433,146.7826,17.5577,,,,199.3799,184.3349,459.4296,,,,24.4142,27.1997,31.9532,32.7170,11.8054,0.2756,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.0000,0.0000,0.3229,0.0000,0.0000,1.8481,0.5672,0.0000,5.3401,3.1096,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3201,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.9377,1701.8773,22.0000,14.3957,3.1563,0.0000,0.0000,39.5689,0.2450,N/A,0.402692750162188,,,,,NOT CERTIFIED,N/A,0.974012575676176,,,,,,NOT CERTIFIED,N/A,0.858794922444015,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
+#@ SHA256: eqKpvxyzfOrieT968SXYj9/Ox+FMas2rKR1/MT1Q8es=
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 b6afc9fd4b45f41e3bcb42e3e755cbff09445a1b..81ead04f83ed95e737129748a9d945b9c7ed4e27 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:53
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index 57c0cb63e2226c9b42a28c3bce616aca478143cc..d9553ebcdbbafc985905f81c93191ecf24e757b4 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-342-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8508,46.6998,15.8669,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,13.9097,,,,198.2396,183.1780,363.9729,,,,15.7837,20.1449,23.9428,25.1533,9.0761,0.4368,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.0000,0.0000,0.2775,0.0000,0.0000,1.8463,0.8116,0.0000,2.2240,3.1119,0.3594,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1120.4152,1796.5316,26.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.390507866135044,,,,,NOT CERTIFIED,N/A,0.973052763802168,,,,,,NOT CERTIFIED,N/A,0.83430658481887,N/A,NOT CERTIFIED,16.5512,7.8522,0.7698,1.0778,3.4642,49.6536,20.6313
-#@ SHA256: +qtOb2TOBmAEWjF9btkJCu+3Qsx+0/yESXdh4cbSarE=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+5-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8508,46.6998,15.8669,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,13.9097,,,,198.2396,183.1780,363.9729,,,,15.7837,20.1449,23.9428,25.1533,9.0761,0.4368,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.0000,0.0000,0.2775,0.0000,0.0000,1.8463,0.8116,0.0000,2.2240,3.1119,0.3594,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1120.4152,1796.5316,26.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.390507866135044,,,,,NOT CERTIFIED,N/A,0.973052763802168,,,,,,NOT CERTIFIED,N/A,0.83430658481887,N/A,NOT CERTIFIED,16.5512,7.8522,0.7698,1.0778,3.4642,49.6536,20.6313
+#@ SHA256: PhrlgkHtOwMugCcL+DdxvACu4kkDq6joFJvCtUu+QDU=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index facf5a6f0c4c9760053476600258972590160be5..fea129671f7ce885125e0f1fe45fd324f79b5acb 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-345-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8508,46.6998,15.8669,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,13.9097,,,,198.2396,183.1780,363.9729,,,,15.7837,20.1449,23.9428,25.1533,9.0761,0.4368,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.0000,0.0000,0.2775,0.0000,0.0000,1.8463,0.8116,0.0000,2.2240,3.1119,0.3594,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1120.4152,1796.5316,26.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.390507866135044,,,,,NOT CERTIFIED,N/A,0.973052763802168,,,,,,NOT CERTIFIED,N/A,0.83430658481887,N/A,NOT CERTIFIED,16.5512,7.8522,0.7698,1.0778,3.4642,49.6536,20.6313
-#@ SHA256: 981s93uD8yy8DAJjPbKP+AGi3Jrnc4TtclG6yfdyWxg=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+15-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8508,46.6998,15.8669,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,0.0000,0.0000,5430.4957,116.2853,5430.4957,116.2853,13.9097,,,,198.2396,183.1780,363.9729,,,,15.7837,20.1449,23.9428,25.1533,9.0761,0.4368,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0087,0.0000,0.0000,0.2775,0.0000,0.0000,1.8463,0.8116,0.0000,2.2240,3.1119,0.3594,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3181,-0.3326,23.0177,22.1709,40.4157,80.5095,1.1306,1.6261,1120.4152,1796.5316,26.0000,14.3957,2.2325,0.0000,0.0000,40.0308,0.3062,N/A,0.390507866135044,,,,,NOT CERTIFIED,N/A,0.973052763802168,,,,,,NOT CERTIFIED,N/A,0.83430658481887,N/A,NOT CERTIFIED,16.5512,7.8522,0.7698,1.0778,3.4642,49.6536,20.6313
+#@ SHA256: 8htFboMkMT2622i5eXzZ/RAZZAr2uPdLMhKryPwfjd8=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
index befbe54f3bd127da022cd3fcb0c31a48ccb42200..62fa32ba2c8dc9a964650dc99d64ee551363adf9 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index 90acb45c4cd37b834d428584882d665809d6b254..a3752767ae5af089f0a96697ce57ae20a1896c54 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-343-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8561,46.7143,15.8669,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,4056.5443,86.8374,10.3872,,,,195.2592,179.7775,271.8010,,,,7.2483,13.7626,16.0203,18.0164,6.5009,0.7203,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.0000,0.0000,0.2500,0.0000,0.0000,1.8443,1.0643,0.0000,-0.8571,3.1128,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3385,22.8637,21.4011,41.3395,80.5095,1.1306,1.6261,1116.4414,1620.3683,22.0000,14.3957,1.5396,0.0000,0.0000,40.0308,0.3144,N/A,0.374442969418009,,,,,NOT CERTIFIED,N/A,0.970216684820176,,,,,,NOT CERTIFIED,N/A,0.80379124532862,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,50.0385,20.8622
-#@ SHA256: 4D0PrTtsAqNEb/vq1slr5y5iST1wvEV1BWWpaTDzZ8c=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+13-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8561,46.7143,15.8669,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,0.0000,0.0000,4056.5443,86.8374,4056.5443,86.8374,10.3872,,,,195.2592,179.7775,271.8010,,,,7.2483,13.7626,16.0203,18.0164,6.5009,0.7203,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0067,0.0000,0.0000,0.2500,0.0000,0.0000,1.8443,1.0643,0.0000,-0.8571,3.1128,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3385,22.8637,21.4011,41.3395,80.5095,1.1306,1.6261,1116.4414,1620.3683,22.0000,14.3957,1.5396,0.0000,0.0000,40.0308,0.3144,N/A,0.374442969418009,,,,,NOT CERTIFIED,N/A,0.970216684820176,,,,,,NOT CERTIFIED,N/A,0.80379124532862,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,50.0385,20.8622
+#@ SHA256: fsvkbfBPrzC7xzAI8qsH/lQDN5T1EhygVF8+qAB4r90=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
index 7a7994759aba6a706dd51f6052774831764ceef7..15e6f5e95336d587d4a3bb505e37337283e3e796 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index bb353120bfb2bb50e0d879f0d52ab8ec3dd883e5..c4a14bca13e83c2510b54d94386bf0b70c8b4329 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-344-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8544,46.7098,15.8669,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,4629.3148,99.1081,11.8550,,,,196.0719,180.9230,310.2083,,,,11.0892,16.2864,19.3366,20.8721,7.5314,0.5541,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0076,0.0000,0.0000,0.2588,0.0000,0.0000,1.8455,0.8641,0.0000,0.5292,3.1125,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3171,-0.3290,22.9407,22.4788,40.1848,80.5095,1.1306,1.6261,1117.4258,1620.7745,22.0000,14.3957,1.7706,0.0000,0.0000,40.0308,0.3096,N/A,0.380123796451876,,,,,NOT CERTIFIED,N/A,0.971334244105636,,,,,,NOT CERTIFIED,N/A,0.817092169463241,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.1155,20.7082
-#@ SHA256: 42yPu6c5Ku/tfLY23oXFVsVG/d68zD7SbWOKqgWdDTs=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+14-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8544,46.7098,15.8669,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,0.0000,0.0000,4629.3148,99.1081,4629.3148,99.1081,11.8550,,,,196.0719,180.9230,310.2083,,,,11.0892,16.2864,19.3366,20.8721,7.5314,0.5541,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0076,0.0000,0.0000,0.2588,0.0000,0.0000,1.8455,0.8641,0.0000,0.5292,3.1125,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3171,-0.3290,22.9407,22.4788,40.1848,80.5095,1.1306,1.6261,1117.4258,1620.7745,22.0000,14.3957,1.7706,0.0000,0.0000,40.0308,0.3096,N/A,0.380123796451876,,,,,NOT CERTIFIED,N/A,0.971334244105636,,,,,,NOT CERTIFIED,N/A,0.817092169463241,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.1155,20.7082
+#@ SHA256: qoUaWE4BpskT+xf5WImM6TS51e9pk+cf9WVjo5q7Jqk=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
index 37d95b46f408c591eceec113af12cb8b8f628f48..3d7e6a0af2ebef24c80fca58f5a147dae4d22eea 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index 8fa85c8128c5d58140326f93038725336283802c..5193adfb7306296c9c33038eee02ca0ca3b49a98 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-341-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8547,46.7104,15.8669,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,4407.8963,94.3664,11.2878,,,,195.5454,180.4273,295.3668,,,,9.6229,15.2982,18.0566,19.7503,7.1266,0.6112,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.2554,0.0000,0.0000,1.8450,0.9355,0.0000,0.0000,3.1126,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3175,-0.3342,22.8637,21.8630,40.8776,80.5095,1.1306,1.6261,1116.4342,1620.3683,22.0000,14.3957,1.6936,0.0000,0.0000,40.0308,0.3109,N/A,0.377761274946201,,,,,NOT CERTIFIED,N/A,0.970918314733561,,,,,,NOT CERTIFIED,N/A,0.812538775721098,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,50.0385,20.8622
-#@ SHA256: JWh6YupdgCWp1tRjhgZc2j2p4hwBH5AWZnojpe+bUsg=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+11-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,6.1650,-,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,,,1299.0000,16.8547,46.7104,15.8669,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,0.0000,0.0000,4407.8963,94.3664,4407.8963,94.3664,11.2878,,,,195.5454,180.4273,295.3668,,,,9.6229,15.2982,18.0566,19.7503,7.1266,0.6112,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0073,0.0000,0.0000,0.2554,0.0000,0.0000,1.8450,0.9355,0.0000,0.0000,3.1126,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3175,-0.3342,22.8637,21.8630,40.8776,80.5095,1.1306,1.6261,1116.4342,1620.3683,22.0000,14.3957,1.6936,0.0000,0.0000,40.0308,0.3109,N/A,0.377761274946201,,,,,NOT CERTIFIED,N/A,0.970918314733561,,,,,,NOT CERTIFIED,N/A,0.812538775721098,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,50.0385,20.8622
+#@ SHA256: 4nLR8LcDDiQvXq28FKgGbMy1Gg5IE6G00dk/Zp6fBP8=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
index a8f0d666b658e74bdd2839a4397c6eeed604ae39..0ca9fa3faa93c5a888f9676f4ba8c4386b3de80d 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
index befbe54f3bd127da022cd3fcb0c31a48ccb42200..62fa32ba2c8dc9a964650dc99d64ee551363adf9 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
index 0d7f3740c90431df2dad00d0a943a5ae56244b7e..cc15e8d42babe24f86d26312face986086bdf892 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:54
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:08
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
 2.5000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0,600.0000,0.0000,586.7144,-100.9497,0.0000,36.8644,36.8644,-6.3429,0.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,767.0000,767.0000,767.0000,767.0000,1
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index 9fe50137cdf1c5417156c105fbb094cc0ccd6c1b..88cd687d943e84a69639bd6506befeb5625683e3 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-328-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,0.0000,,,,59.3466,59.3466,62.3778,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,33.3333,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
-#@ SHA256: 60FoxOMeC3JkaGj3/+VQuxAMe6Vl45+4WlWJ8M11g6E=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:09
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+1-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,4.1500,-,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,0.0000,,,,59.3466,59.3466,62.3778,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,33.3333,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
+#@ SHA256: JolEN7GixKm8X2tvundHORUgq4lHTeV3URMYofCi64E=
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 000ebd2b90907a73f370e2aba3ae7c5c000906f2..5b685ca6167de11ff0ef99e4a670925e979d91ba 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.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:09
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,511.0587,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,19058.1764,19058.1764,19058.1764,19058.1764,1
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index f7d228a0c8aa32a08049d96b69136d3dc3181d59..18f381e33df869dc65f8920db1898a9a00bd5f29 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-330-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,,,1566.4000,0.0000,0.0000,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,0.0000,,9528.3843,,9528.3843,,,,,,192.4816,184.2535,0.0000,,,,34.0136,41.2262,42.3421,44.8506,19.5150,1.0915,-0.0004,0.0000,0.0000,0.0000,0.0000,0.0000,0.0042,0.0000,0.0000,0.7099,0.0000,0.0000,1.0740,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1400.6978,2293.0401,52.0000,100.0000,4.5965,0.0000,0.0000,0.0000,0.0000,N/A,0.39684760824751,,,,,NOT CERTIFIED,N/A,0.968864499507214,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
-#@ SHA256: ytBZ/igWl8zK4zgbL9nWNfHEIkbukScqHT47AA/IkRE=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:09
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+2-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,4.1500,-,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,,,,1566.4000,0.0000,0.0000,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,9528.3843,,9528.3843,,9528.3843,,0.0000,,9528.3843,,0.0000,,9528.3843,,9528.3843,,,,,,192.4816,184.2535,0.0000,,,,34.0136,41.2262,42.3421,44.8506,19.5150,1.0915,-0.0004,0.0000,0.0000,0.0000,0.0000,0.0000,0.0042,0.0000,0.0000,0.7099,0.0000,0.0000,1.0740,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1400.6978,2293.0401,52.0000,100.0000,4.5965,0.0000,0.0000,0.0000,0.0000,N/A,0.39684760824751,,,,,NOT CERTIFIED,N/A,0.968864499507214,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
+#@ SHA256: lBUn13V3ofOtBBQiuf+xl1rs/We6WWUHz6C2G91st1w=
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 b9e30c849d37fd508adfbb01057e54ffb4a78d33..bc8852d2026fa99b65683944072609d181e63f44 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 09:09
 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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [g/h],FC-Final_mod [g/h],ICE On
 0.6000,0.4000,,,,,,,2,688.9318,2.7845,626.1455,-81.9622,0.2009,45.1731,45.1731,-5.9131,0.0000,0.2009,0.0000,0.2009,0.0000,,0.2009,0.1611,0.0000,0.0398,0.0000,,,0.0398,0.0398,,,0.0000,,,,,,,158.1713,2.4013,3.1866,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,836.6317,836.6317,836.6317,836.6317,1
 1.0000,0.4000,,,,,,,2,688.9318,2.7845,626.1455,-81.9622,0.2009,45.1731,45.1731,-5.9131,0.0000,0.2009,0.0000,0.2009,0.0000,,0.2009,0.1611,0.0000,0.0398,0.0000,,,0.0398,0.0398,,,0.0000,,,,,,,158.1713,2.4013,3.1866,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,836.6317,836.6317,836.6317,836.6317,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
index b1e4f4cbf34798c781aa0c8489241c36474e35c5..9c7f2be39774639060b89a656ad3e11d94a36a9d 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum	
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum	
@@ -1,6 +1,6 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option
-329-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,0.0000,0.0000,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,0.0000,,8165.4651,,8165.4651,,,,,,,171.8999,0.0000,,,,0.0000,0.0000,28.2231,30.0366,5.7987,0.3501,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1306.6190,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.310130398319601,,,,,,,,,,,,,,,,,
-329-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,0.0000,0.0000,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,0.0000,,8480.9585,,8480.9585,,,,,,,165.6956,0.0000,,,,0.0000,0.0000,28.8901,30.8542,8.6220,0.5488,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1368.7890,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.306721156907804,,,,,,,,,,,,,,,,,
-329-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,0.0000,0.0000,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,0.0000,,6591.7966,,6591.7966,,,,,,,174.5276,0.0000,,,,0.0000,0.0000,19.1988,21.9781,1.0134,0.1282,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1213.8903,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.281100452512794,,,,,,,,,,,,,,,,,
-#@ SHA256: XjcupxGyxTtaKpQhDBwF/roSyqHk+Qq9vfTFP/pN0D4=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 19:21
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option
+241-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,0.0000,0.0000,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,0.0000,,8165.4651,,8165.4651,,,,,,,171.8999,0.0000,,,,0.0000,0.0000,28.2231,30.0366,5.7987,0.3501,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1306.6190,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.310130398319601,,,,,,,,,,,,,,,,,
+241-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,0.0000,0.0000,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,0.0000,,8480.9585,,8480.9585,,,,,,,165.6956,0.0000,,,,0.0000,0.0000,28.8901,30.8542,8.6220,0.5488,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1368.7890,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.306721156907804,,,,,,,,,,,,,,,,,
+241-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,0.0000,0.0000,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,0.0000,,6591.7966,,6591.7966,,,,,,,174.5276,0.0000,,,,0.0000,0.0000,19.1988,21.9781,1.0134,0.1282,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1213.8903,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,0.281100452512794,,,,,,,,,,,,,,,,,
+#@ SHA256: 3MQgB3635gsahL4CbaO4EoDwJt2xvmSh/d4s096JIGg=
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 89e7cd3e9bebf44c1579d2456c2d22f6fc9f4245..fadf1d6cd66db229e348319e30c7a4b38ac139a6 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 19:21
 time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_ice_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_el [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_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,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,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 04254a0319cb1abcb41ae417d6e3f789fb059309..f89044603b82b92979a7c15eef9e96127761ce83 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 19:21
 time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_ice_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_el [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_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,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,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 99a33aebbbda5ea1d3c91c348340f1f71db2825e..27ac7209b80d5b150e38769e6f3d4b76d03483cd 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 19:21
 time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_ice_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_el [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_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,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,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
index 4b96dbec8defa02ff0890c594ed4f6905009a48a..40a19ab9904e4bbd43cf39e9789858ae4cbf84e6 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 12:03
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option
-0-0,AuxWriteModFileSumFile,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,767.0000,,767.0000,,767.0000,,767.0000,,767.0000,,0.0000,,767.0000,,0.0000,,767.0000,,767.0000,,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,0.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
-#@ SHA256: /QTs6iCHqEYrXy2YbA16WEatNUHhPQt+a4UTkCbnsNw=
+# VECTO-DEV 0.7.6.2507-DEV - 16.11.2021 14:18
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option
+0-0,AuxWriteModFileSumFile,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,767.0000,,767.0000,,767.0000,,767.0000,,767.0000,,0.0000,,767.0000,,0.0000,,767.0000,,767.0000,,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,0.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
+#@ SHA256: YoP//zag8LcDx7h2dpfm9R/8kvaun2wGC7foDrq5rxw=
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 13472b0753181cb2d12b6b0ddd824d13ddbd5a95..03b8310e6322f1a0d7a43c01b9e7ed3319e1f1c9 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 27.07.2021 03:50
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 19:21
 time [s],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_ice_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_el [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_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,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,1
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
index a4448c2d6cadf827a484dba8f63ff2875161bbaa..a661ecafbdce6004e0646902ad7c5f244c1fd2b1 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 26.07.2021 21:03
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
-237-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N/A,-,15700.0000,3300.0000,,19000.0000,N/A,Generic 24t Coach,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2634,no,0.0055,62538.7500,0.0065,52532.5500,0.0055,62538.7500,,,0.00640424928879442,0.00640424928879442,0.5200,1,2,0,N/A,Generic 24t Coach,AMT,6.3800,0.7600,N/A,N/A,N/A,N/A,Secondary Retarder,N/A,N/A,3.5,N/A,Generic 24t Coach,3.2404,,,,,,AMT - EffShift,0,,,,,,,4117.8099,16.8120,14.6979,-43.9640,3746.6425,254.9099,3746.6425,254.9099,3746.6425,254.9099,0.0000,0.0000,3746.6425,254.9099,3746.6425,254.9099,3746.6425,254.9099,3746.6425,254.9099,0.0000,0.0000,3746.6425,254.9099,0.0000,0.0000,3746.6425,254.9099,3746.6425,254.9099,30.4916,9.2399,,,189.7365,162.0096,797.8679,241.7782,,,3.1638,9.0920,12.3286,14.2778,16.3315,2.2295,0.0027,0.0000,0.0000,0.0000,0.0000,0.0000,0.0082,0.0000,0.0000,1.0012,1.2154,4.8398,1.4520,1.9638,0.0835,0.2358,5.5710,-2.2714,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0013,0.6193,-0.2686,0.4208,0.3165,99.2141,20.0000,1.3773,0.6427,718.6140,1562.0320,6.0000,0.0486,0.0451,0.0000,0.0000,0.0321,0.1138,N/A,0.321287785374652,,,,,NOT CERTIFIED,N/A,0.951732720747578,NOT CERTIFIED,N/A,NOT CERTIFIED,N/A,0.776403319935401,NOT CERTIFIED,N/A,0.916824347079567,N/A,NOT CERTIFIED,0.8579,0.0000,0.0000,0.0000,0.0000,0.0572,0.1522,49.8931,49.0396
-#@ SHA256: ctj6jyk5tuMmcShWAsuqjdasBmF11rRVN4EZwzu9Cl8=
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 18:54
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,REESS Capacity,Auxiliary technology ENG_AUX_BASE [-],Auxiliary technology ENG_AUX_STP [-],Auxiliary technology ENG_AUX_FAN [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-SoC [g/h],FC-SoC [g/km],FC-SoC_Corr [g/h],FC-SoC_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_ENG_AUX_BASE [kWh],E_aux_ENG_AUX_STP [kWh],E_aux_ENG_AUX_FAN [kWh],E_aux_sum [kWh],E_aux_el(HV) [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_ice_start [kWh],E_aux_ESS_missing [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],ICE max. Load time share [%],ICE off time share [%],CoastingTimeShare [%],BrakingTimeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [-],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [-],Average torque converter efficiency with lockup [-],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [-],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [-],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [-],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
+99-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N/A,-,15700.0000,3300.0000,,19000.0000,N/A,Generic 24t Coach,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,"System.Linq.Enumerable+WhereSelectListIterator`2[TUGraz.VectoCommon.BusAuxiliaries.IFuelProperties,System.String]",N/A,,3.2634,-,0.0055,62538.7500,0.0065,52532.5500,0.0055,62538.7500,,,0.00640424928879442,0.00640424928879442,0.5200,1,2,0,N/A,Generic 24t Coach,AMT,6.3800,0.7600,N/A,N/A,N/A,N/A,Secondary Retarder,N/A,N/A,3.5,N/A,Generic 24t Coach,3.2404,,,,,,AMT - EffShift,0,,,,,,,4117.8099,16.8120,14.6979,-43.9640,3746.6425,254.9099,3746.6425,254.9099,3746.6425,254.9099,0.0000,0.0000,3746.6425,254.9099,3746.6425,254.9099,3746.6425,254.9099,3746.6425,254.9099,0.0000,0.0000,3746.6425,254.9099,0.0000,0.0000,3746.6425,254.9099,3746.6425,254.9099,30.4916,9.2399,,,189.7365,162.0096,797.8679,241.7782,,,3.1638,9.0920,12.3286,14.2778,16.3315,2.2295,0.0027,0.0000,0.0000,0.0000,0.0000,0.0000,0.0082,0.0000,0.0000,1.0012,1.2154,4.8398,1.4520,1.9638,0.0835,0.2358,5.5710,-2.2714,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0013,0.6193,-0.2686,0.4208,0.3165,99.2141,20.0000,1.3773,0.6427,718.6140,1562.0320,6.0000,0.0486,0.0451,0.0000,0.0000,0.0321,0.1138,N/A,0.321287785374652,,,,,NOT CERTIFIED,N/A,0.951732720747578,NOT CERTIFIED,N/A,NOT CERTIFIED,N/A,0.776403319935401,NOT CERTIFIED,N/A,0.916824347079567,N/A,NOT CERTIFIED,0.8579,0.0000,0.0000,0.0000,0.0000,0.0572,0.1522,49.8931,49.0396
+#@ SHA256: JlyHYmsxAxuFT4JpfiYVVmHR1DGC9sMzZYbUuyAJ81A=
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 00ff786398c4786b907321c5a85f989728e65e5f..6ac423ef84e5ac8e02ad4c89b4496d548be8cfe4 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,4 +1,4 @@
-# VECTO-DEV 0.7.5.2380-DEV - 26.07.2021 21:03
+# VECTO-DEV 0.7.6.2507-DEV - 15.11.2021 18: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_ice_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_el [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],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],FC-Map [g/h],FC-NCVc [g/h],FC-WHTCc [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,0.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,0.0000,1256.0000,1256.0000,1256.0000,1256.0000,0,0,0,0,1
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
index 5a5a68898038f5bbce99769758e928970bdc3b6b..f9a5e6fb20186c2096ada2751fd24fdfafbdfccb 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public GearData GetGearData(uint gear)
 		{
-			throw new NotImplementedException();
+			return null;
 		}
 
 		public PerSecond EngineSpeed { get; set; }