diff --git a/VectoCore/VectoCoreTest/FileIO/JsonTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
index 69f9c6ad9a986dd37c4c79d9775fef01d3c506b2..1ff3545fac4cf224b957d37f9f9f63f49c41e2a3 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
@@ -184,7 +184,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
 			Assert.AreEqual(AngularGearType.SeparateAngularGear,
 				angleGear["Type"].Value<string>().ParseEnum<AngularGearType>());
 			Assert.AreEqual(3.5, angleGear["Ratio"].Value<double>());
-			Assert.AreEqual("AngularGear.vtlm", angleGear["LossMap"].Value<string>());
+			Assert.AreEqual("AngleGear.vtlm", angleGear["LossMap"].Value<string>());
 		}
 	}
 
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index 41a4034fd6d854174ca28979be5673adc7ca3811..143dc279b1fd9f037eaaff77b4a00fd26ed3e732 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -53,16 +53,16 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 		public const double Tolerance = 0.0001;
 		public readonly MissionType[] Missions = EnumHelper.GetValues<MissionType>().ToArray();
 
-		[TestCase("285/70 R19.5", 7.9, 0.8943, 3.03),
+		[TestCase("285/60 R22.5", 10.6, 0.9135, 3.03),
+		TestCase("285/70 R19.5", 7.9, 0.8943, 3.05),
 		TestCase("395/85 R20", 27.9, 1.1795, 3.05)]
-		public void WheelDataTest(string wheels, double inertia, double dynamicRadius, string sizeClass,
-			double circumferenceFactor)
+		public void WheelDataTest(string wheels, double inertia, double dynamicRadius, double circumferenceFactor)
 		{
 			var tmp = DeclarationData.Wheels.Lookup(wheels);
 
-			Assert.AreEqual(inertia, tmp.Inertia.Value(), Tolerance);
-			Assert.AreEqual(dynamicRadius, tmp.DynamicTyreRadius.Value(), Tolerance);
-			Assert.AreEqual(circumferenceFactor, tmp.CircumferenceFactor, Tolerance);
+			AssertHelper.AreRelativeEqual(inertia, tmp.Inertia);
+			AssertHelper.AreRelativeEqual(dynamicRadius, tmp.DynamicTyreRadius);
+			AssertHelper.AreRelativeEqual(circumferenceFactor, tmp.CircumferenceFactor);
 		}
 
 		[
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
index 5e8691d2b833e4a8924faef6e3e7812fb99a7711..926cad1ca836184f2a161c57e0e8d28a9ae0e9f2 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -43,6 +43,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Declaration;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
@@ -231,7 +232,14 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 						CrossWindCorrectionCurve =
 							new CrosswindCorrectionCdxALookup(
 								CrossWindCorrectionCurveReader.GetNoCorrectionCurve(6.16498344.SI<SquareMeter>()),
-								CrossWindCorrectionMode.NoCorrection)
+								CrossWindCorrectionMode.NoCorrection),
+						GrossVehicleWeight = 12000.SI<Kilogram>(),
+						CurbWeight = 3400.SI<Kilogram>(),
+						DynamicTyreRadius = 0.5.SI<Meter>(),
+						AxleData =
+							new List<Axle> {
+								new Axle { AxleWeightShare = 1.0, TyreTestLoad = 52532.SI<Newton>(), Inertia = 10.SI<KilogramSquareMeter>() }
+							}
 					},
 				AxleGearData = new AxleGearData { AxleGear = new GearData { Ratio = 2.3 } },
 				EngineData = new CombustionEngineData { IdleSpeed = 560.RPMtoRad(), FullLoadCurve = fullLoadCurve },