Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r3811 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 3811)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 3876)
@@ -643,7 +643,7 @@
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].StabilityDesignResults.RedesignedSurfaceLine;
             if (redesignedSurfaceLine != null)
             {
-                Assert.AreEqual(expectedDikeLength, redesignedSurfaceLine.GetDikeLength(), Tolerance);
+                Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(expectedDikeLength).Within(Tolerance));
                 GeometryPoint pointShoulderBaseInside = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside);
                 if (pointShoulderBaseInside != null)
                 {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r3520 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 3876)
@@ -78,7 +78,7 @@
             Assert.AreEqual(0.521, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance);
             Assert.AreEqual(1.667, output.Results.CalculationResults[0].PipingDesignResults.BlighHcritical, tolerance);
             Assert.AreEqual(35.0, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance);
-            Assert.AreEqual(25.00, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(25.00).Within(tolerance));
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
 
             // The following values are not the same as in the Dam 15.1.2.24738 release (but explainable)
@@ -131,7 +131,7 @@
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
-            Assert.AreEqual(63.486, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(63.486).Within(tolerance));
             Assert.AreEqual(32.5, redesignedSurfaceLine.DetermineShoulderLength(), tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3875 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3875)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3876)
@@ -475,7 +475,7 @@
                 Assert.AreEqual("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)", result.BaseFileName);
                 Assert.AreEqual("..\\Test\\Stability\\UpliftVan", result.CalculationSubDir);
                 Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult);
-                Assert.AreEqual(1.5211, result.StabilityDesignResults.SafetyFactor, diff);
+                Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.5211).Within(diff));
                 Assert.AreEqual(50.5, result.StabilityDesignResults.ActiveCenterPoint.X, diff);
                 Assert.AreEqual(12, result.StabilityDesignResults.ActiveCenterPoint.Z, diff);
                 Assert.AreEqual(22, result.StabilityDesignResults.ActiveCenterPointRadius, diff);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r3875 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3875)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3876)
@@ -132,8 +132,8 @@
                 Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
                 Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
                 Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
-                Assert.AreEqual(3.65, result.PipingDesignResults.SellmeijerVnkFactor, diff);
-                Assert.AreEqual(3.65, result.PipingDesignResults.SellmeijerVnkHcritical, diff);
+                Assert.That(result.PipingDesignResults.SellmeijerVnkFactor, Is.EqualTo(3.65).Within(diff));
+                Assert.That(result.PipingDesignResults.SellmeijerVnkHcritical, Is.EqualTo(3.65).Within(diff));
 
                 Assert.AreEqual(50.5, result.PipingDesignResults.LocalExitPointX);
                 Assert.AreEqual(0.067957866123003738, result.PipingDesignResults.UpliftFactor);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
===================================================================
diff -u -r3875 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs	(.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs)	(revision 3875)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs	(.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs)	(revision 3876)
@@ -130,21 +130,21 @@
                 Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
                 Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
                 Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
-                Assert.AreEqual(90, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor, diff);
-                Assert.AreEqual(expectedHcbe, result.PipingDesignResults.Wti2017BackwardErosionHcritical, diff);
-                Assert.AreEqual(expectedDeltaPhiCbe, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC, diff);
-                Assert.AreEqual(0.70, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced, diff);
-                Assert.AreEqual(0.56948691811077123, result.PipingDesignResults.Wti2017UpliftSafetyFactor, diff);
-                Assert.AreEqual(0.56948691811077123, result.PipingDesignResults.Wti2017UpliftHcritical, diff);
-                Assert.AreEqual(0.4271151885830784, result.PipingDesignResults.Wti2017UpliftDeltaPhiC, diff);
-                Assert.AreEqual(0.40, result.PipingDesignResults.Wti2017HeaveSafetyFactor, diff);
-                Assert.AreEqual(0.40, result.PipingDesignResults.Wti2017HeaveHcritical, diff);
-                Assert.AreEqual(0.75, result.PipingDesignResults.Wti2017Gradient, diff);
-                Assert.AreEqual(4.19, result.PipingDesignResults.EffectiveStress, diff);
-                Assert.AreEqual(expectedCcreep, result.PipingDesignResults.CCreep, diff);
+                Assert.That(result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor, Is.EqualTo(90).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017BackwardErosionHcritical, Is.EqualTo(expectedHcbe).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC, Is.EqualTo(expectedDeltaPhiCbe).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced, Is.EqualTo(0.70).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017UpliftSafetyFactor, Is.EqualTo(0.56948691811077123).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017UpliftHcritical, Is.EqualTo(0.56948691811077123).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017UpliftDeltaPhiC, Is.EqualTo(0.4271151885830784).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017HeaveSafetyFactor, Is.EqualTo(0.40).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017HeaveHcritical, Is.EqualTo(0.40).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017Gradient, Is.EqualTo(0.75).Within(diff));
+                Assert.That(result.PipingDesignResults.EffectiveStress, Is.EqualTo(4.19).Within(diff));
+                Assert.That(result.PipingDesignResults.CCreep, Is.EqualTo(expectedCcreep).Within(diff));
 
-                Assert.AreEqual(90, result.PipingDesignResults.Wti2017SafetyFactorOverall, diff);
-                Assert.AreEqual(expectedHcbe, result.PipingDesignResults.Wti2017HcriticalOverall, diff);
+                Assert.That(result.PipingDesignResults.Wti2017SafetyFactorOverall, Is.EqualTo(90).Within(diff));
+                Assert.That(result.PipingDesignResults.Wti2017HcriticalOverall, Is.EqualTo(expectedHcbe).Within(diff));
 
                 Assert.AreEqual(59.5, result.PipingDesignResults.LocalExitPointX);
                 Assert.AreEqual(0.88258734130293759, result.PipingDesignResults.UpliftFactor);
@@ -220,7 +220,7 @@
             // All expected results are from calculation by hand.
             Assert.AreEqual(4.19, damPipingOutput.EffectiveStress, diff);
             Assert.AreEqual(59.50, damPipingOutput.ExitPointX, diff);
-            Assert.AreEqual(0.88258734130293759, damPipingOutput.UpliftFactor, diff);
+            Assert.That(damPipingOutput.UpliftFactor, Is.EqualTo(0.88258734130293759).Within(diff));
             Assert.AreEqual(true, damPipingOutput.UpliftSituation.IsUplift);            
         }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs
===================================================================
diff -u -r3520 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 3876)
@@ -107,7 +107,7 @@
             // shoulder height = 1.995
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
             // dike length = 66.986
-            Assert.AreEqual(66.986, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(66.986).Within(tolerance));
             
             // ShoulderWidth = X_Kruin binnenberm - X_Insteek binnenberm = 65.01 - 29.01 = 36.0
             // Read from PipingSellmeijer4Forces_Piping_CharacteristicPoints.csv by export surfacelines in Release
@@ -170,7 +170,7 @@
             // The following test are the same as for CanPerformSellmeijer4ForcesDesignWithAdaptionPipingVoorbeeld1()
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
-            Assert.AreEqual(66.986, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(66.986).Within(tolerance));
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r3520 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 3876)
@@ -69,7 +69,7 @@
             // Piping exit point = 35.0
             Assert.AreEqual(35.0, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance);
             // Dike length = 25.00
-            Assert.AreEqual(25.00, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(25.00).Within(tolerance));
             // Uplift = true
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
             // Uplift factor = 0.582
@@ -106,7 +106,7 @@
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
             // Note Bka: Anwers here are 17 meter longer shoulder than Sellmeijer4Forces from which these tests are derived.
             // dike length = 66.986 + 17
-            Assert.AreEqual(83.986, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(83.986).Within(tolerance));
 
             // ShoulderWidth = X_Kruin binnenberm - X_Insteek binnenberm = 65.01 + 17 - 29.01 = 53.0 
             Assert.AreEqual(53.0, redesignedSurfaceLine.DetermineShoulderLength(), tolerance);
@@ -160,7 +160,7 @@
             // The following test are the same as for CanPerformWtiSellmeijerRevisedDesignWithAdaptionPipingVoorbeeld1()
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
-            Assert.AreEqual(83.986, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(83.986).Within(tolerance));
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r3875 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 3875)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 3876)
@@ -109,8 +109,8 @@
                 Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
                 Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
                 Assert.AreEqual(result.ProfileName, Is.Null);
-                Assert.AreEqual(4.5, result.PipingDesignResults.BlighFactor, diff);
-                Assert.AreEqual(2.25, result.PipingDesignResults.BlighHcritical, diff);
+                Assert.That(result.PipingDesignResults.BlighFactor, Is.EqualTo(4.5).Within(diff));
+                Assert.That(result.PipingDesignResults.BlighHcritical, Is.EqualTo(2.25).Within(diff));
 
                 Assert.AreEqual(50.5, result.PipingDesignResults.LocalExitPointX);
                 Assert.AreEqual(0.072811999417504, result.PipingDesignResults.UpliftFactor);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
===================================================================
diff -u -r3520 -r3876
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 3876)
@@ -109,7 +109,7 @@
             // shoulder height = 1.995
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
             // dike length = 84.486
-            Assert.AreEqual(84.486, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(84.486).Within(tolerance));
 
             // ShoulderLength = X_Kruin binnenberm - X_Insteek binnenberm = 82.51 - 29.01 = 53.5
             // Read from PipingSellmeijerVNK_Piping_CharacteristicPoints.csv by export surfacelines in Release