diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
index 3f8364d6106..7a948df9cbc 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
@@ -62,7 +62,7 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest {
      */
     @Rule
     public TestRule getTimeoutRule() {
-        return Timeout.millis(3 * 60 * 1000);
+        return Timeout.millis(5 * 60 * 1000);
     }
 
     protected AbstractTracTracLiveTest() throws URISyntaxException, MalformedURLException {
diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java
index b2fadc7d92c..74948790bb1 100644
--- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java
+++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java
@@ -89,8 +89,8 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra
     public static final String[] modelFilesNames = {
             "SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom0.0To10.0.clf",
             "SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom10.0To912.0.clf",
-            "SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom1368.0ToMaximum.clf",
             "SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom912.0To1368.0.clf",
+            "SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom1368.0ToMaximum.clf",
             "SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom0.0To1.0.clf",
             "SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom1.0To140.0.clf",
             "SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom140.0To5394.0.clf",
@@ -223,14 +223,16 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra
                 foundCount++;
             }
         }
-        assertTrue((double) foundCount / (double) estimatedWindFixes.size() > PERCENT_QUANTILE);
+        assertTrue("Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size(),
+                (double) foundCount / (double) estimatedWindFixes.size() > PERCENT_QUANTILE);
         foundCount = 0;
         for (Wind wind : targetWindFixes) {
             if (findWithinTolerance(estimatedWindFixesMap, new Pair<>(wind.getPosition(), wind.getTimePoint())) != null) {
                 foundCount++;
             }
         }
-        assertTrue((double) foundCount / (double) targetWindFixes.size() > PERCENT_QUANTILE);
+        assertTrue("Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size(),
+                (double) foundCount / (double) targetWindFixes.size() > PERCENT_QUANTILE);
     }
 
     /**
diff --git a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/regressor/twdtransition/DistanceBasedTwdTransitionRegressorModelContext.java b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/regressor/twdtransition/DistanceBasedTwdTransitionRegressorModelContext.java
index 972c2a2f850..16b65bcbc25 100644
--- a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/regressor/twdtransition/DistanceBasedTwdTransitionRegressorModelContext.java
+++ b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/regressor/twdtransition/DistanceBasedTwdTransitionRegressorModelContext.java
@@ -47,7 +47,7 @@ public final class DistanceBasedTwdTransitionRegressorModelContext
      *
      */
     public enum DistanceValueRange {
-        BEGINNING(0, 10, 1, false), MIDDLE1(10, 912, 1, true), MIDDLE2(912, 20000, 1, true), REMAINDER(20000,
+        BEGINNING(0, 10, 1, false), MIDDLE1(10, 912, 1, true), MIDDLE2(912, 1368, 1, true), REMAINDER(1368,
                 SupportedDimensionValueRange.MAX_VALUE, 1, true);
 
         private final SupportedDimensionValueRange supportedDimensionValueRange;