diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index 90774e49e1ab6f8f6c5cf989f762cf0b2b715c45..2af103d1b421b2ae625610ee093cd670549ac693 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -198,7 +198,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			var halted = DataBus.DrivingAction == DrivingAction.Halt;
 			var driverDeceleratingNegTorque = DataBus.DriverBehavior == DrivingBehavior.Braking &&
-											(DataBus.BrakePower.IsGreater(0) || inTorque < 0);
+											(DataBus.BrakePower.IsGreater(0) || inTorque.IsSmaller(0));
 			var vehiclespeedBelowThreshold =
 				DataBus.VehicleSpeed.IsSmaller(Constants.SimulationSettings.ClutchDisengageWhenHaltingSpeed);
 			if (halted || (driverDeceleratingNegTorque && vehiclespeedBelowThreshold)) {
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 296f6d4986e22d2f7bc64eaf4957aa962180a1da..32e161f1bc4c1f9588de001c8ac2283ac26feab9 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -102,7 +102,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 				GearboxData = gearboxData,
 				EngineData = engineData,
 				AirdragData = airDragData,
-				SimulationType = SimulationType.DistanceCycle
+				SimulationType = SimulationType.DistanceCycle,
+				Cycle = cycleData
 			};
 
 			container.RunData = runData;
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index 13dc5cdc5bd73329520361f5d07140ac7a60414a..df6189b37a2a06810a60e1ddd804152b5be584a0 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
@@ -58,10 +58,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
 		}
 
-		[TestCase(null, 1.0, 45.53793),
-		TestCase("CFRegPer", 1.2, 45.53793 * 1.2),
-		TestCase("BFColdHot", 1.2, 45.53793 * 1.2),
-		TestCase("CFNCV", 1.2, 45.53793)  // has no influence - only for documentation purpose
+		[TestCase(null, 1.0, 45.5309587),
+		TestCase("CFRegPer", 1.2, 45.5309587 * 1.2),
+		TestCase("BFColdHot", 1.2, 45.5309587 * 1.2),
+		TestCase("CFNCV", 1.2, 45.5309587)  // has no influence - only for documentation purpose
 			]
 		public void TestEngineCorrectionFactors(string correctionFactor, double value, double expectedFc)
 		{
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
index 9a66c7aaa8cfa3cd718d6347e3eb5085367759fe..5b5b2483e3f3d1b3c06e0e5a94585ba9fdcdaf83 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -34,8 +34,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 		[
 		 TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.4),
 		 TestCase(Class5NG, 2, TankSystem.Compressed, 259.4, 697.7),
-		TestCase(Class5NG, 6, TankSystem.Liquefied, 252.7, 700.0),
-		TestCase(Class5NG, 6, TankSystem.Compressed, 258.5, 695.4),
+		TestCase(Class5NG, 6, TankSystem.Liquefied, 252.7, 699.8),
+		TestCase(Class5NG, 6, TankSystem.Compressed, 258.4, 695.4),
 			]
 		public void NaturalGasTankSystemTest(string filename, int runIdx, TankSystem tankSystem, double expectedFc, double expectedCo2)
 		{