diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index b526d5762a75f6d0e3e4abf85b2cd627a383ca05..ffd2b1e6759b86849f5c713ca61cd6052fdee091 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		{
 			ModelData = modelData;
 			AirdragData = airdrag;
-			if (AirdragData.CrossWindCorrectionCurve != null) {
+			if (AirdragData?.CrossWindCorrectionCurve != null) {
 				AirdragData.CrossWindCorrectionCurve.SetDataBus(container);
 			}
 			var model = container.RunData;
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index 2e96e7ad0d6165d5fae4bca65a3669d1d4761ca5..2127a1961f01ecd743099ec0d8c056fc9c0a1dac 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -97,6 +97,9 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 				GearshiftParameters = CreateGearshiftData(),
 				VehicleData = vehicleData,
 				AirdragData = airDragData,
+				Retarder = new RetarderData() { Type = RetarderType.None},
+				Cycle = cycleData,
+				Aux = new List<VectoRunData.AuxData>(),
 				SimulationType = SimulationType.DistanceCycle,
 				ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>()
 			};
@@ -262,7 +265,10 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 				GearboxData = gearboxData,
 				GearshiftParameters = CreateGearshiftData(),
 				AirdragData = airDragData,
+				Retarder = new RetarderData() { Type = RetarderType.None},
 				DriverData = driverData,
+				Cycle = cycleData,
+				Aux = new List<VectoRunData.AuxData>(),
 				ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>()
 			};
 			var fileWriter = new FileOutputWriter("Coach_FullPowertrain_LowSpeed");
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index 7a080834409c2f3aef269be3ea46a51595371199..1f988ec23bbb248e3bdfa8f79e6050857302fbc0 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -102,6 +102,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 				AirdragData = airdragData,
 				AxleGearData = axleGearData,
 				GearboxData = gearboxData,
+				Retarder = new RetarderData() { Type = RetarderType.None},
+				Aux = new List<VectoRunData.AuxData>(),
 				GearshiftParameters = CreateGearshiftData(),
 				SimulationType = SimulationType.DistanceCycle,
 				Cycle = cycleData,
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index b9b343ed3b5042c203fbebf18b3bb3b6efbed95e..c11b7dc668746d8c0474d3bbb14ebe2107f846c8 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -263,6 +263,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var engineData = new CombustionEngineData() {
 				IdleSpeed = 600.RPMtoRad(),
 				Inertia = 0.SI<KilogramSquareMeter>(),
+				EngineStartTime = 1.SI<Second>(),
 			};
 			var fullLoadCurves = new Dictionary<uint, EngineFullLoadCurve>();
 			fullLoadCurves[0] = FullLoadCurveReader.Create(
@@ -276,13 +277,23 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			engineData.FullLoadCurves = fullLoadCurves;
 			return new VectoRunData() {
 				VehicleData = new VehicleData() {
-					DynamicTyreRadius = 0.492.SI<Meter>()
+					DynamicTyreRadius = 0.492.SI<Meter>(),
+					CurbMass = 10000.SI<Kilogram>(),
+					AxleData = new List<Axle>() {
+						new Axle() {
+							AxleWeightShare = 1,
+							Inertia = 0.SI<KilogramSquareMeter>(),
+							RollResistanceCoefficient = 0.0055,
+							TyreTestLoad = 33500.SI<Newton>(),
+						}
+					}
 				},
 				AxleGearData = new AxleGearData() {
 					AxleGear = new GearData() {
 						Ratio = 2.64
 					}
 				},
+				Retarder = new RetarderData() { Type = RetarderType.None },
 				EngineData = engineData,
 				GearboxData = gearboxData,
 				GearshiftParameters = new ShiftStrategyParameters() {
@@ -292,6 +303,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 					DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
 					UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
 					UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration,
+				},
+				Cycle = new DrivingCycleData() {
+					CycleType = CycleType.EngineOnly
 				}
 			};
 		}
diff --git a/VectoCore/VectoCoreTest/Reports/GearshiftCountTest.cs b/VectoCore/VectoCoreTest/Reports/GearshiftCountTest.cs
index a0a23f9a149819d6eab5d216fc2310c572a77cbd..330808a4f2e691da84fbbe76e5e9594ec5b211bd 100644
--- a/VectoCore/VectoCoreTest/Reports/GearshiftCountTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/GearshiftCountTest.cs
@@ -32,6 +32,7 @@
 using NUnit.Framework;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.OutputData;
 
 namespace TUGraz.VectoCore.Tests.Reports
@@ -44,7 +45,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		public void TestGearshiftCountTractionInterruptionShiftup()
 		{
 			var rundata = new VectoRunData() {
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
             };
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -72,7 +74,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		{
 			var rundata = new VectoRunData()
 			{
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
 			};
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -100,7 +103,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		{
 			var rundata = new VectoRunData()
 			{
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
 			};
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -129,7 +133,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		{
 			var rundata = new VectoRunData()
 			{
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
 			};
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -157,7 +162,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		{
 			var rundata = new VectoRunData()
 			{
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
 			};
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -187,7 +193,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		{
 			var rundata = new VectoRunData()
 			{
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
 			};
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -216,7 +223,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 		{
 			var rundata = new VectoRunData()
 			{
-				JobName = "GearshiftRun"
+				JobName = "GearshiftRun",
+				GearboxData = new GearboxData()
 			};
 			var modData = new ModalDataContainer(rundata, null, null);
 			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);