Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r4627 -r4908
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4627)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4908)
@@ -97,17 +97,23 @@
         Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Output.xml");
 
         int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
-        Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation.");
-        Assert.That(engineInterface.DamProjectData.CalculationMessages.Count, Is.EqualTo(output.Results.CalculationMessages.Length));
-        Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(8));
-        Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[1].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.331).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[2].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.206).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[3].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.475).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[4].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.248).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[5].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.223).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[6].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.393).Within(tolerance3Decimals));
-        Assert.That(output.Results.CalculationResults[7].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.373).Within(tolerance3Decimals));
+        Assert.Multiple(() =>
+        {
+            Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation.");
+            Assert.That(engineInterface.DamProjectData.CalculationMessages, Has.Count.EqualTo(output.Results.CalculationMessages.Length));
+            Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(8));
+        });
+        Assert.Multiple(() =>
+        {
+            Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.559).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[1].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.470).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[2].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.337).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[3].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.261).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[4].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.393).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[5].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.363).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[6].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.195).Within(tolerance3Decimals));
+            Assert.That(output.Results.CalculationResults[7].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.250).Within(tolerance3Decimals));
+        });
     }
 
     [Test, Category(Categories.MultiCore)]
@@ -222,25 +228,25 @@
             // This test has to make sure that the results are the same as the single core version of this test
             // If the values change below, just change them.
             Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(9));
-            Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1424));
+            Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1762));
         }
         else
         {
-            // Note that all results are based on the single core version of this tests that can be found at:
+            // Note that all results are based on the single core version of this test that can be found at:
             // DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect in MacroStabilityInwardsTests
-            Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(18));
-            Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(3008));
+            Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(12));
+            Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2477));
         }
 
         int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
             output.Results.CalculationResults);
         if (justOneScenario)
         {
-            Assert.That(resultsFound, Is.EqualTo(9));
+            Assert.That(resultsFound, Is.EqualTo(7));
         }
         else
         {
-            Assert.That(resultsFound, Is.EqualTo(18));
+            Assert.That(resultsFound, Is.EqualTo(15));
             CheckLargeResultsSets.CheckBasicResultsBasedOnReferenceResultsFile(
                 "TestFiles\\DesignBishopAdaptionWithScenariosForHeadPl3_Results.xml", outputFileName,
                 output.Results.CalculationResults);
@@ -279,10 +285,13 @@
         string outputFileName = "LargeInsideBishopNoAdaptionGridResults_Cores_" + maxCores + ".xml";
         Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputFileName);
 
-        // This test has to make sure that the results are the same as the single core version of this test
-        // If the values change below, just change them.
-        Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2768));
-        Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(646));
+        Assert.Multiple(() =>
+        {
+            // This test has to make sure that the results are the same as the single core version of this test
+            // If the values change below, just change them.
+            Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2766));
+            Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(646));
+        });
         // This file is created in the Debug/Release folder while running this test.
         // If this file changes just replace it with the file that is created during the test.
         // The purpose of this test is just comparing the multicore test with the single core test.