Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs
===================================================================
diff -u -r6148 -r6149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs	(.../DamEngineDataTestFactory.cs)	(revision 6148)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs	(.../DamEngineDataTestFactory.cs)	(revision 6149)
@@ -66,7 +66,7 @@
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 30,
             Cohesion = 0,
-            DilatancyType = DilatancyType.Zero
+            DilatancyType = DilatancyType.Phi
         };
         soilList.Soils.Add(s1);
         var s2 = new Soil("LM")
@@ -76,7 +76,7 @@
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 10,
             Cohesion = 5,
-            DilatancyType = DilatancyType.Zero
+            DilatancyType = DilatancyType.Phi
         };
         soilList.Soils.Add(s2);
         var s3 = new Soil("OB1")
@@ -86,7 +86,7 @@
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 31,
             Cohesion = 0,
-            DilatancyType = DilatancyType.Zero
+            DilatancyType = DilatancyType.Phi
         };
         soilList.Soils.Add(s3);
         var s4 = new Soil("OB2")
@@ -96,7 +96,7 @@
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 34,
             Cohesion = 0,
-            DilatancyType = DilatancyType.Zero
+            DilatancyType = DilatancyType.Phi
         };
         soilList.Soils.Add(s4);
         
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r6086 -r6149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 6086)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 6149)
@@ -495,7 +495,7 @@
         var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
         Assert.Multiple(() =>
         {
-            Assert.That(messages, Has.Count.EqualTo(24));
+            Assert.That(messages, Has.Count.EqualTo(6));
             Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded));
             Assert.That(messages[0].Message, Does.Contain("A slice is beyond the geometry at x"));
         });
@@ -506,18 +506,18 @@
     /// safety factor than On boundary lines because there are extra tangent lines.
     /// </summary>
     [Test]
-    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 1.2812, 4)]
-    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.2360, 2)]
-    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 0.4909, 24)]
-    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.4752, 3)]
-    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.1437, 3)]
-    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.1475, 3)]
-    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 2.2763, 3)]
-    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 2.0267, 3)]
-    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 1.7680, 3)]
-    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.1205, 926)]
-    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.1123, 800)]
-    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.1146, 826)]
+    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 1.4948, 4)]
+    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.4421, 2)]
+    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 1.3570, 6)]
+    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.5784, 3)]
+    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.3344, 3)]
+    [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.3388, 3)]
+    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 2.2428, 3)]
+    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.8935, 3)]
+    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 2.2109, 3)]
+    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.3073, 926)]
+    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.2978, 800)]
+    [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.2986, 924)]
     public void GivenUpliftVanModel_WhenCalculatingWithDifferentSearchAreaSettings_ReturnsLogicalResults(MStabSearchMethod searchMethod, GridSizeDetermination gridSizeDetermination, TangentLinesDefinition tangentLinesDefinition, double expectedSafetyFactor, int expectedLogMessageCount)
     {
         // Prepare the wrapper. Result is input for the calculation dll
@@ -632,7 +632,7 @@
                 Assert.That(result.BaseFileName, Is.EqualTo("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)"));
                 Assert.That(result.CalculationSubDir, Is.EqualTo("..\\Test\\Stability\\UpliftVan"));
                 Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded));
-                Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.2812).Within(tolerance4Decimals));
+                Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.4948).Within(tolerance4Decimals));
                 Assert.That(result.StabilityDesignResults.ActiveCenterPoint.X, Is.EqualTo(52.75).Within(tolerance4Decimals));
                 Assert.That(result.StabilityDesignResults.ActiveCenterPoint.Z, Is.EqualTo(16.75).Within(tolerance4Decimals));
                 Assert.That(result.StabilityDesignResults.ActiveCenterPointRadius, Is.EqualTo(17).Within(tolerance4Decimals));