Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs
===================================================================
diff -u -r4909 -r4920
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs	(.../PlLinesToWaternetConverter.cs)	(revision 4909)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs	(.../PlLinesToWaternetConverter.cs)	(revision 4920)
@@ -181,27 +181,6 @@
         return waternet;
     }
 
-    internal static WaternetLine CreateWaternetLine(double level, double xLeft, double xRight)
-    {
-        var waternetLine = new WaternetLine();
-        waternetLine.Points.Add(new GeometryPoint(xLeft, level));
-        waternetLine.Points.Add(new GeometryPoint(xRight, level));
-        waternetLine.SyncCalcPoints();
-        return waternetLine;
-    }
-
-    private static WaternetLine CreateWaternetLine(double levelTop, double levelBottom, double xLeft, double xRight)
-    {
-        var waternetLine = new WaternetLine();
-        waternetLine.Points.Add(new GeometryPoint(xLeft, levelTop));
-        waternetLine.Points.Add(new GeometryPoint(xRight, levelTop));
-        waternetLine.Points.Add(new GeometryPoint(xRight, levelBottom));
-        waternetLine.Points.Add(new GeometryPoint(xLeft, levelBottom));
-        waternetLine.Points.Add(new GeometryPoint(xLeft, levelTop));
-        waternetLine.SyncCalcPoints();
-        return waternetLine;
-    }
-
     /// <summary>
     /// Determine all the xCoordinates to make cross-sections. 
     /// </summary>
@@ -301,7 +280,28 @@
         line.Name = name;
         return line;
     }
+    
+    internal static WaternetLine CreateWaternetLine(double level, double xLeft, double xRight)
+    {
+        var waternetLine = new WaternetLine();
+        waternetLine.Points.Add(new GeometryPoint(xLeft, level));
+        waternetLine.Points.Add(new GeometryPoint(xRight, level));
+        waternetLine.SyncCalcPoints();
+        return waternetLine;
+    }
 
+    private static WaternetLine CreateWaternetLine(double levelTop, double levelBottom, double xLeft, double xRight)
+    {
+        var waternetLine = new WaternetLine();
+        waternetLine.Points.Add(new GeometryPoint(xLeft, levelTop));
+        waternetLine.Points.Add(new GeometryPoint(xRight, levelTop));
+        waternetLine.Points.Add(new GeometryPoint(xRight, levelBottom));
+        waternetLine.Points.Add(new GeometryPoint(xLeft, levelBottom));
+        waternetLine.Points.Add(new GeometryPoint(xLeft, levelTop));
+        waternetLine.SyncCalcPoints();
+        return waternetLine;
+    }
+
     private static WaternetLine CreateWaternetLine(IEnumerable<Point2D> coordinates)
     {
         return CreateWaternetLine(coordinates, 0);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs
===================================================================
diff -u -r4919 -r4920
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(.../CheckLargeResultsSets.cs)	(revision 4919)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(.../CheckLargeResultsSets.cs)	(revision 4920)
@@ -403,9 +403,12 @@
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
             {
-                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.391).Within(tolerance));
-                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
-                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
+                Assert.Multiple(() =>
+                {
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.391).Within(tolerance));
+                    Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                    Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
+                });
                 resultsFound++;
             }
 
@@ -444,9 +447,12 @@
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
             {
-                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.552).Within(tolerance));
-                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
-                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
+                Assert.Multiple(() =>
+                {
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.552).Within(tolerance));
+                    Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                    Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
+                });
                 resultsFound++;
             }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
===================================================================
diff -u -r4907 -r4920
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 4907)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 4920)
@@ -81,7 +81,7 @@
         Output output = GeneralHelper.RunAfterInputValidation(inputString, false);
 
         // As the data is not entirely correct for the new kernel, we expect 1 error.
-        Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1));
+        Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1));
         Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("De berekening is mislukt met de volgende foutmelding"), output.Results.CalculationMessages[0].Message1);
     }
 
@@ -96,6 +96,6 @@
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
-        Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(653), "Number of messages found = " + output.Results.CalculationMessages.Length);
+        Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(653), "Number of messages found = " + output.Results.CalculationMessages.Length);
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4907 -r4920
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4907)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4920)
@@ -898,22 +898,28 @@
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
         // one location is calculated with 3 1D profiles
-        Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(3));
-        Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F"));
-        Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s"));
-        Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F"));
-        Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s"));
-        Assert.That(output.Results.CalculationResults[2].LocationName, Is.EqualTo("6-4-1-A-1-F"));
-        Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s"));
+        Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3));
+        Assert.Multiple(() =>
+        {
+            Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F"));
+            Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s"));
+            Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F"));
+            Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s"));
+            Assert.That(output.Results.CalculationResults[2].LocationName, Is.EqualTo("6-4-1-A-1-F"));
+            Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s"));
+        });
 
         DesignResult result = output.Results.CalculationResults[0];
-        // SafetyFactor=1.638
-        Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.611).Within(tolerance));
+        Assert.Multiple(() =>
+        {
+            // SafetyFactor=1.638
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.611).Within(tolerance));
 
-        // skip testing some of the results like uplift etc.
+            // skip testing some of the results like uplift etc.
 
-        // Calculation Result
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+            // Calculation Result
+            Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+        });
 
         // test safety factor for other profiles
         result = output.Results.CalculationResults[1];