diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index 0de2c6437fbab411dde67d4e0cc860633a90a20d..fe4da016ccf5086b97b8b6547892415533201dfc 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 
 		{
 			var fileWriter = new FileOutputWriter("AuxWriteModFileSumFile");
-			var modData = new ModalDataContainer("AuxWriteModFileSumFile", fileWriter);
+			var modData = new ModalDataContainer("AuxWriteModFileSumFile", fileWriter) { WriteModalResults = true };
 			modData.AddAuxiliary("FAN");
 			modData.AddAuxiliary("PS");
 			modData.AddAuxiliary("STP");
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
index 21369b83b464e39fbba34c0a0841a5af29b6aa6b..34505febccb80167fe473c54c217625176a71900 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
@@ -33,6 +33,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.InputData.Reader;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
 using TUGraz.VectoCore.Models.Simulation.Impl;
@@ -129,7 +130,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			// request with 1m (18 -> 19m) => response exceeded, drive up to next sample point (at least 5m)
 			response = cycle.OutPort().Request(absTime, 1.SI<Meter>());
 			Assert.IsInstanceOfType(response, typeof(ResponseDrivingCycleDistanceExceeded));
-			Assert.AreEqual(5, ((ResponseDrivingCycleDistanceExceeded)response).MaxDistance.Value());
+			Assert.AreEqual(Constants.SimulationSettings.BrakeNextTargetDistance.Value(),
+				((ResponseDrivingCycleDistanceExceeded)response).MaxDistance.Value(), 1e-6);
 
 			// next request with 5m, as suggested => distance exceeded. maxDistance == 2m (next speed change)....
 			response = cycle.OutPort().Request(absTime, ((ResponseDrivingCycleDistanceExceeded)response).MaxDistance);