diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
index 1a276314e74054384453b4c84afd575220a5c306..d66de6b8d8b6431f70e3481c4381b4259f778df9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
@@ -9,9 +9,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
 		<Date>2017-09-26T15:33:45.0798047Z</Date>
 		<LegislativeClass>N3</LegislativeClass>
 		<VehicleCategory>Tractor</VehicleCategory>
-		<AxleConfiguration>4x2</AxleConfiguration>
-		<CurbMassChassis>8229</CurbMassChassis>
-		<TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
+		<AxleConfiguration>4x2F</AxleConfiguration>
+		<CurbMassChassis>4229</CurbMassChassis>
+		<TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
 		<IdlingSpeed>100</IdlingSpeed>
 		<RetarderType>Transmission Output Retarder</RetarderType>
 		<RetarderRatio>1.000</RetarderRatio>
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index ad5c46453a6eceb083f6c89bb643f11691e6ce01..f946a7ce7998e64f5d944358a50370dbe4c3fe00 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -62,8 +62,8 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(2.700, vehicle.Height.Value());
 			Assert.AreEqual(11.830, vehicle.Length.Value());
 			Assert.AreEqual(2.550, vehicle.Width.Value());
-			Assert.AreEqual(0.120, ((XMLDeclarationCompletedBusDataProviderV26)vehicle).EntranceHeight.Value());
-			Assert.AreEqual("pneumatic", ((XMLDeclarationCompletedBusDataProviderV26)vehicle).DoorDriveTechnology);
+			Assert.AreEqual(0.120, vehicle.EntranceHeight.Value());
+			Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicle.DoorDriveTechnology);
 	
 			var components = inputDataProvider.JobInputData.Vehicle.Components;
 			Assert.IsNotNull(components);
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 2e775ccb16788f15e0861f88f843832ad44dff29..5b9919d94061c64d4ba5938e9cd2316c9f27047f 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -90,7 +90,7 @@ namespace TUGraz.VectoCore.Tests.XML
 		public void CreateRunDataMediumLorry()
 		{
 			var runIdx = 0;
-			var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry.xml";
+			var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry-sample.xml";
 
 			var writer = new FileOutputWriter(jobFile);
 			var inputData = xmlInputReader.CreateDeclaration(jobFile);
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
index 5e1c367e7ed3687a2d57dcb3d194b86d2725c037..7a4538a9887cbf8bd4b0b9139236adc33948138e 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.Tests.XML
 		protected IXMLInputDataReader xmlInputReader;
 		private IKernel _kernel;
 
-		const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml";
+		const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus-sample.xml";
 
 
 		[OneTimeSetUp]