diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index d968799e596d9d960098899ad6a16796310fc980..f1d2061bc53b9d45fcc8f923dfc59acc9920b0c2 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -707,7 +707,7 @@ namespace TUGraz.VectoCore.OutputData
 			row[Fields.VIN_NUMBER] = data.VIN;
 			row[Fields.VEHICLE_MODEL] = data.ModelName;
 
-			row[Fields.HDV_CO2_VEHICLE_CLASS] = runData.Mission.BusParameter?.BusGroup.GetClassNumber() ?? data.VehicleClass.GetClassNumber();
+			row[Fields.HDV_CO2_VEHICLE_CLASS] = runData.Mission?.BusParameter?.BusGroup.GetClassNumber() ?? data.VehicleClass.GetClassNumber();
 			row[Fields.CURB_MASS] = (ConvertedSI)data.CurbMass;
 
 			// - (data.BodyAndTrailerWeight ?? 0.SI<Kilogram>());
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index b9975eb8c17d448f54a547c0d6e98c223855a0a0..4f2fe51e1d8d92e6b06c8d7634c2c133f9968218 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -184,7 +184,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 						GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
 					},
 					JobInputData = new MockJobInputData() {
-						Vehicle = new MockEngineeringVehicleInputData() {
+						IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
 							GearboxInputData = inputProvider,
 							TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
 						}
@@ -225,7 +225,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 						GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
 					},
 					JobInputData = new MockJobInputData() {
-						Vehicle = new MockEngineeringVehicleInputData() {
+						IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
 							GearboxInputData = inputProvider,
 							TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
 						}
@@ -273,7 +273,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 						GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
 					},
 					JobInputData = new MockJobInputData() {
-						Vehicle = new MockEngineeringVehicleInputData() {
+						IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
 							GearboxInputData = inputProvider,
 							TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
 						}
@@ -320,7 +320,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 						GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
 					},
 					JobInputData = new MockJobInputData() {
-						Vehicle = new MockEngineeringVehicleInputData() {
+						IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
 							GearboxInputData = inputProvider,
 							TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
 						}
@@ -368,7 +368,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 						GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
 					},
 					JobInputData = new MockJobInputData() {
-						Vehicle = new MockEngineeringVehicleInputData() {
+						IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
 							GearboxInputData = inputProvider,
 							TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
 						}
@@ -416,7 +416,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 						GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
 					},
 					JobInputData = new MockJobInputData() {
-						Vehicle = new MockEngineeringVehicleInputData() {
+						IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
 							GearboxInputData = inputProvider,
 							TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
 						}