Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs
===================================================================
diff -u -r6404 -r6406
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs	(.../ShearStrengthModelsTests.cs)	(revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs	(.../ShearStrengthModelsTests.cs)	(revision 6406)
@@ -114,15 +114,15 @@
                 Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("ShansepMaterial"));
                 Assert.That(output.Results.CalculationResults[1].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded)));
             });
-            Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(9));
+            Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(3));
             Assert.Multiple(() =>
             {
-                Assert.That(output.Results.CalculationMessages[3].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[3].Message1, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'"));
-                Assert.That(output.Results.CalculationMessages[4].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[4].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
-                Assert.That(output.Results.CalculationMessages[5].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[5].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
+                Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Error));
+                Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'"));
+                Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error));
+                Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
+                Assert.That(output.Results.CalculationMessages[2].MessageType, Is.EqualTo(MessageMessageType.Error));
+                Assert.That(output.Results.CalculationMessages[2].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
             });
         }
 
@@ -148,17 +148,17 @@
                 Assert.That(output.Results.CalculationResults[3].ProfileName, Is.EqualTo("SigmaTauPhi45"));
                 Assert.That(output.Results.CalculationResults[4].ProfileName, Is.EqualTo("ShansepPhi45"));
                 Assert.That(output.Results.CalculationResults[5].ProfileName, Is.EqualTo("SuTablePhi45"));
-                Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(359));
+                Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(3));
             });
 
             Assert.Multiple(() =>
             {
-                Assert.That(output.Results.CalculationMessages[8].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[8].Message1, Is.EqualTo("Validation failed for location 'Comparison models (constant tau)', subsoil scenario 'SuTableCsttSu', design scenario '1'"));
-                Assert.That(output.Results.CalculationMessages[9].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[9].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
-                Assert.That(output.Results.CalculationMessages[10].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[10].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
+                Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Error));
+                Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Validation failed for location 'Comparison models (constant tau)', subsoil scenario 'SuTableCsttSu', design scenario '1'"));
+                Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error));
+                Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
+                Assert.That(output.Results.CalculationMessages[2].MessageType, Is.EqualTo(MessageMessageType.Error));
+                Assert.That(output.Results.CalculationMessages[2].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
             });
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r6404 -r6406
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 6406)
@@ -495,7 +495,7 @@
         var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
         Assert.Multiple(() =>
         {
-            Assert.That(messages, Has.Count.EqualTo(6));
+            Assert.That(messages, Has.Count.EqualTo(0));
             Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded));
             Assert.That(messages[0].Message, Does.Contain("A slice is beyond the geometry at x"));
         });
@@ -506,19 +506,19 @@
     /// safety factor than On boundary lines because there are extra tangent lines.
     /// </summary>
     [Test]
-    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 1.4948, 4)]
-    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.4421, 2)]
-    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 1.3570, 6)]
-    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.5784, 3)]
-    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.3344, 3)]
-    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.3388, 3)]
-    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 2.2428, 3)]
-    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.8935, 3)]
-    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 2.2109, 3)]
-    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.3073, 926)]
-    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.2978, 800)]
-    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.2986, 924)]
-    public void GivenUpliftVanModel_WhenCalculatingWithDifferentSearchAreaSettings_ReturnsLogicalResults(StabilitySearchMethod searchMethod, GridSizeDetermination gridSizeDetermination, TangentLinesDefinition tangentLinesDefinition, double expectedSafetyFactor, int expectedLogMessageCount)
+    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 1.4948)]
+    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.4421)]
+    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 1.3570)]
+    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.5784)]
+    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.3344)]
+    [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.3388)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 2.2428)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.8935)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 2.2109)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.3073)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.2978)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.2986)]
+    public void GivenUpliftVanModel_WhenCalculatingWithDifferentSearchAreaSettings_ReturnsLogicalResults(StabilitySearchMethod searchMethod, GridSizeDetermination gridSizeDetermination, TangentLinesDefinition tangentLinesDefinition, double expectedSafetyFactor)
     {
         // Prepare the wrapper. Result is input for the calculation dll
         DamKernelInput kernelInput = CreateDamKernelInputForTest(StabilityModelType.UpliftVan, searchMethod, gridSizeDetermination, tangentLinesDefinition);
@@ -546,7 +546,7 @@
         var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
         Assert.Multiple(() =>
         {
-            Assert.That(messages, Has.Count.EqualTo(expectedLogMessageCount));
+            Assert.That(messages, Has.Count.EqualTo(0));
             Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded));
             Assert.That(macroStabilityOutput.StabilityOutputItems, Has.Count.EqualTo(1));
         });