Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(.../CheckLargeResultsSets.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(.../CheckLargeResultsSets.cs)	(revision 4624)
@@ -63,80 +63,80 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.579, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.481, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.481).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.355, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.355).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.168).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.272, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.272).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
             }
@@ -145,7 +145,7 @@
         }
 
         Assert.IsTrue(seriesCount > 0, "No output time series");
-        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
+        Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results");
     }
 
     public static void CheckResultsDesignBishopWithScenariosForHeadPl3CalculatesCorrect(DesignResult[] calculationResults)
@@ -154,128 +154,128 @@
         {
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)"))
             {
-                Assert.AreEqual(9.300, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(9.300).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)"))
             {
-                Assert.AreEqual(7.888, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.888).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)"))
             {
-                Assert.AreEqual(7.023, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.023).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)"))
             {
-                Assert.AreEqual(5.968, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.968).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)"))
             {
-                Assert.AreEqual(7.555, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.555).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)"))
             {
-                Assert.AreEqual(6.477, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.477).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)"))
             {
-                Assert.AreEqual(7.353, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.353).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)"))
             {
-                Assert.AreEqual(6.278, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.61, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.278).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.61).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)"))
             {
-                Assert.AreEqual(5.945, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.945).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)"))
             {
-                Assert.AreEqual(1.225, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.225).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)"))
             {
-                Assert.AreEqual(1.608, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.608).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)"))
             {
-                Assert.AreEqual(1.397, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.397).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)"))
             {
-                Assert.AreEqual(4.557, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.557).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)"))
             {
-                Assert.AreEqual(3.985, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.985).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)"))
             {
-                Assert.AreEqual(4.087, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.087).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)"))
             {
-                Assert.AreEqual(3.418, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.418).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)"))
             {
-                Assert.AreEqual(4.432, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.432).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)"))
             {
-                Assert.AreEqual(3.745, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.745).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
             }
         }
     }
@@ -287,145 +287,145 @@
         {
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
             {
-                Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.306).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
             {
-                Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.986).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
             {
-                Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.155).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
             {
-                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.335).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
             {
-                Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.188).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
             {
-                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.784).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
             {
-                Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.752).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
             {
-                Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.270).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.52).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
             {
-                Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
             {
-                Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.224).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
             {
-                Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.598).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
             {
-                Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.382).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
             {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
             {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
             {
-                Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                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++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)"))
             {
-                Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.876).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
             {
-                Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.538).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
                 resultsFound++;
             }
 
             if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
             {
-                Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.503).Within(tolerance));
+                Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
+                Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 resultsFound++;
             }
         }
@@ -443,7 +443,7 @@
         }
 
         Output output = DamXmlSerialization.LoadOutputFromXmlFile(resultsFile);
-        Assert.AreEqual(output.Results.CalculationResults.Count(), calculationResults.Count(), "Results Count does not match");
+        Assert.That(calculationResults.Count(), Is.EqualTo(output.Results.CalculationResults.Count()), "Results Count does not match");
         var totalDifferences = 0;
         foreach (DesignResult expectedDesignResult in output.Results.CalculationResults)
         {
@@ -479,7 +479,7 @@
             totalDifferences += result.Differences.Count;
         }
 
-        Assert.AreEqual(0, totalDifferences, "Total differences found comparing design results for " + resultsFile);
+        Assert.That(totalDifferences, Is.EqualTo(0), "Total differences found comparing design results for " + resultsFile);
     }
 
     private static void WriteDifferencesToLog(string logFile, string baseFileName, ComparisonResult result)