diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
index e7edb0a1ba071756d7dfa03f95fa44b4742f5d31..cf94baf9491598740471e4f516c78570e5af12ba 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -305,7 +305,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 						{ 1, new GearData { Ratio = 6.696 } },
 						{ 2, new GearData { Ratio = 3.806 } },
 						{ 3, new GearData { Ratio = 2.289 } }
-					}
+					},
+					StartSpeed = 2.SI<MeterPerSecond>()
 				},
 				Retarder = new RetarderData()
 			};
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
index 85e7f637ad4cd3482cbb1125526a325d4a8bb8fb..b662ea721fc97e19eaa890910dd2d98502db6af9 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
@@ -34,6 +34,7 @@ using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
@@ -72,7 +73,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(EngineDataFile);
 			vehicleContainer.Engine = new CombustionEngine(vehicleContainer,engineData);
 			var gearboxData = MockSimulationDataFactory.CreateGearboxDataFromFile(GearboxDataFile, EngineDataFile, false);
-			var gearbox = new ATGearbox(vehicleContainer, new ATShiftStrategy(gearboxData, vehicleContainer), null);
+			var runData = new VectoRunData() {GearboxData = gearboxData};
+			var gearbox = new ATGearbox(vehicleContainer, new ATShiftStrategy(gearboxData, vehicleContainer), runData);
 
 			vehicleContainer.VehicleSpeed = vehicleSpeed.KMPHtoMeterPerSecond();
 
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
index b5c4f9e9e4d10abe6e38d8fb724ca0bbe0000a70..d6ee8ae46f42c20969508b01e2412a1dc8587a5d 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
@@ -35,6 +35,7 @@ using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.InputData.Reader.ComponentData;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.DataBus;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
@@ -109,7 +110,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var engine = new CombustionEngine(container,
 				MockSimulationDataFactory.CreateEngineDataFromFile(ATPowerTrain.EngineFile));
 			container.Engine = engine;
-			var gbx = new ATGearbox(container, new ATShiftStrategy(gearboxData, container), null);
+			var runData = new VectoRunData(){GearboxData = gearboxData};
+			var gbx = new ATGearbox(container, new ATShiftStrategy(gearboxData, container), runData);
 			gbx.Connect(engine);
 			gbx.IdleController = new MockIdleController();
 
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index 271c63dbbd229e1b70341a79fc39aaf365005a03..348f4ac4fd2b4aeee34da7554f6c5bedca8a280c 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -44,6 +44,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.DataBus;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 using TUGraz.VectoCore.Tests.Utils;
@@ -97,7 +98,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				TractionInterruption = 1.SI<Second>(),
 				DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
 				UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
-				UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration
+				UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration,
+				StartSpeed = 2.SI<MeterPerSecond>()
 			};
 		}
 
@@ -228,6 +230,18 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 
 		private static VectoRunData GetDummyRunData(GearboxData gearboxData)
 		{
+			var fld = new[] {
+				"560,1180,-149,0.6		   ",
+				"600,1282,-148,0.6		   ",
+				"799.9999999,1791,-149,0.6 ",
+				"1000,2300,-160,0.6		   ",
+				"1200,2300,-179,0.6		   ",
+				"1400,2300,-203,0.6		   ",
+				"1599.999999,2079,-235,0.49",
+				"1800,1857,-264,0.25	   ",
+				"2000.000001,1352,-301,0.25",
+				"2100,1100,-320,0.25	   ",
+			};
 			return new VectoRunData() {
 				VehicleData = new VehicleData() {
 					DynamicTyreRadius = 0.492.SI<Meter>()
@@ -239,7 +253,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				},
 				EngineData = new CombustionEngineData() {
 					IdleSpeed = 600.RPMtoRad(),
-					Inertia = 0.SI<KilogramSquareMeter>()
+					Inertia = 0.SI<KilogramSquareMeter>(),
+					FullLoadCurve =
+						EngineFullLoadCurve.Create(
+							VectoCSVFile.ReadStream(
+								InputDataHelper.InputDataAsStream("engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s]", fld)))
 				},
 				GearboxData = gearboxData
 			};