diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 6721219de6de33622e6d3538d83bf469bb2a7698..414b5ed20b1f94b251dee8faee9233085fe7beed 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -877,7 +877,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 			Assert.IsNotNull(specificDriver.AccelerationCurve);
 			Assert.AreEqual(genericDriver.AccelerationCurve, specificDriver.AccelerationCurve);
 
-			Assert.AreEqual(DeclarationData.Driver.LookAhead.Enabled, genericDriver.LookAheadCoasting.Enabled);
+			Assert.AreEqual(false, genericDriver.LookAheadCoasting.Enabled);
 			Assert.AreEqual(DeclarationData.Driver.LookAhead.MinimumSpeed, genericDriver.LookAheadCoasting.MinSpeed);
 			Assert.IsNotNull(genericDriver.LookAheadCoasting.LookAheadDecisionFactor);
 			Assert.AreEqual(DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
index c3a2209bd08f8870382a2654343c70a46f02e934..597856f54213c7c34c68c60f22829959a19b70de 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
@@ -312,29 +312,29 @@ namespace TUGraz.VectoCore.Tests.XML
 
 			var result = resultsInputData.Results[0];
 			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual("P31SD", result.VehicleGroup);
-			Assert.AreEqual("Regional Delivery", result.Mission);
+			Assert.AreEqual(VehicleClass.ClassP31SD, result.VehicleGroup);
+			Assert.AreEqual(MissionType.RegionalDelivery, result.Mission);
 
 			TestSimulationParameter(8810, 920, 20, "single fuel mode", result.SimulationParameter);
 
 			result = resultsInputData.Results[1];
 			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual("P31SD", result.VehicleGroup);
-			Assert.AreEqual("Regional Delivery", result.Mission);
+			Assert.AreEqual(VehicleClass.ClassP31SD, result.VehicleGroup);
+			Assert.AreEqual(MissionType.RegionalDelivery, result.Mission);
 
 			TestSimulationParameter(12490, 4600, 80, "single fuel mode", result.SimulationParameter);
 
 			result = resultsInputData.Results[2];
 			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual("P31DD", result.VehicleGroup);
-			Assert.AreEqual("Urban Delivery", result.Mission);
+			Assert.AreEqual(VehicleClass.ClassP31DD, result.VehicleGroup);
+			Assert.AreEqual(MissionType.UrbanDelivery, result.Mission);
 
 			TestSimulationParameter(8810, 920, 20, "single fuel mode", result.SimulationParameter);
 
 			result = resultsInputData.Results[3];
 			Assert.AreEqual("success", result.ResultStatus);
-			Assert.AreEqual("P31DD", result.VehicleGroup);
-			Assert.AreEqual("Urban Delivery", result.Mission);
+			Assert.AreEqual(VehicleClass.ClassP31DD, result.VehicleGroup);
+			Assert.AreEqual(MissionType.UrbanDelivery, result.Mission);
 
 			TestSimulationParameter(12490, 4600, 80, "single fuel mode", result.SimulationParameter);
 		}