diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index 7d9a3523e5079a18b21af8309ed0bfc1b1f022fd..389ea812c800e8f01ebebc205423c227804bc632 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -274,6 +274,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 				SimulationType = SimulationType.DistanceCycle,
 				VehicleDesignSpeed = _segmentCompletedBus.DesignSpeed,
 				GearshiftParameters = _gearshiftData,
+				InputData = InputDataProvider
 			};
 			simulationRunData.EngineData.FuelMode = 0;
 			simulationRunData.VehicleData.VehicleClass = _segmentCompletedBus.VehicleClass;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
index c2c3e20b12a7ccff214dbb7455b067ca4042f1d7..661ce186de76632004b6e569fd3ba5e0cf50d9fc 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 				Report = Report,
 				Mission = new Mission { MissionType = MissionType.ExemptedMission },
 				VehicleData = CreateVehicleData(InputDataProvider.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle),
-				MultistageVIFInputData = InputDataProvider
+				MultistageVIFInputData = InputDataProvider,
 			};
 		}
 		
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
index 8b583724387d32d70b3c492f56aca95c51300818..4d58646be095aabb11b84c849031ac1322fcc22e 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
@@ -35,7 +35,8 @@ using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
 using TUGraz.VectoCore.OutputData;
 
-namespace TUGraz.VectoCore.Models.Simulation.Impl {
+namespace TUGraz.VectoCore.Models.Simulation.Impl 
+{
 	internal class ExemptedRun : VectoRun
 	{
 		private Action<ModalDataContainer> _writeSumData;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
index 03c65264aa420e6eed82a20d3078292739ec6d1b..2c4d5a6fe1580bf18e98cce39c92b345bb04641a 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
@@ -49,8 +49,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 
 		protected XElement GetAirdragElement(XMLDeclarationAirdragDataProviderV20 airdrag)
 		{
-			var retVal = new XElement(v24 + XMLNames.Component_AirDrag, 
-				new XAttribute("xmlns", v20.NamespaceName));
+			var retVal = new XElement(v24 + XMLNames.Component_AirDrag//, 
+				//new XAttribute("xmlns", v20.NamespaceName)
+				);
 			var tmp = XElement.Load(airdrag.XMLSource.CreateNavigator().ReadSubtree());
 			retVal.Add(tmp.Elements());
 			return retVal;
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 03aa0b455d9a33f2519fa07baf44f77e3370af97..80cadb5fade06532d8a012a30b1b7d350ded28f4 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -101,6 +101,7 @@
     <InternalsVisibleTo Include="VectoAuxiliariesTests" />
     <InternalsVisibleTo Include="VECTO3" />
     <InternalsVisibleTo Include="VECTOMultistage" />
+    <InternalsVisibleTo Include="VectoMockup"/>
     <InternalsVisibleTo Include="Vecto3GUI2020Test" />
   </ItemGroup>