Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4624 -r4627
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4624)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4627)
@@ -85,7 +85,7 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
         var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
+        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
@@ -133,14 +133,14 @@
         Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
 
         // Check that a line is specified
-        Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine);
+        Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null);
 
         // Profile name = DWP_1.sti
         Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti"));
 
         // Uplift
         UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation;
-        Assert.IsNotNull(upliftSituation);
+        Assert.That(upliftSituation, Is.Not.Null);
         Assert.That(upliftSituation.IsUplift, Is.EqualTo(true));
         Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance));
         Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance));
@@ -185,14 +185,14 @@
         Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
 
         // Check that a line is specified
-        Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine);
+        Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null);
 
         // Profile name = DWP_1.sti
         Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti"));
 
         // Uplift
         UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation;
-        Assert.IsNotNull(upliftSituation);
+        Assert.That(upliftSituation, Is.Not.Null);
         Assert.That(upliftSituation.IsUplift, Is.EqualTo(true));
         Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance));
         Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance));
@@ -232,20 +232,20 @@
         // Bishop
         DesignResult result = output.Results.CalculationResults[0];
         Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance));
-        Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
-        Assert.IsTrue(result.StabilityDesignResults.UpliftSituation.IsUplift);
+        Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
+        Assert.That(result.StabilityDesignResults.UpliftSituation.IsUplift, Is.True);
         Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop));
         Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)"));
         // Uplift Van
         result = output.Results.CalculationResults[1];
         Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance));
-        Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
+        Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
         Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
         Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)"));
         // Worst of Bishop and Uplift Van 
         result = output.Results.CalculationResults[2];
         Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance));
-        Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
+        Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
         Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
         Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)"));
 
@@ -282,18 +282,18 @@
         // Bishop
         DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
         Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance));
-        Assert.IsNotNull(result.UpliftSituation);
-        Assert.IsTrue(result.UpliftSituation.IsUplift);
+        Assert.That(result.UpliftSituation, Is.Not.Null);
+        Assert.That(result.UpliftSituation.IsUplift, Is.True);
         Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop));
         // Uplift Van
         result = output.Results.CalculationResults[1].StabilityDesignResults;
         Assert.That(result.SafetyFactor, Is.EqualTo(0.574).Within(tolerance));
-        Assert.IsNotNull(result.UpliftSituation);
+        Assert.That(result.UpliftSituation, Is.Not.Null);
         Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
         // Worst of Bishop and Uplift Van 
         result = output.Results.CalculationResults[2].StabilityDesignResults;
         Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance));
-        Assert.IsNotNull(result.UpliftSituation);
+        Assert.That(result.UpliftSituation, Is.Not.Null);
         Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
 
         // Calculation Result
@@ -328,21 +328,21 @@
 
         // Bishop
         DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
-        Assert.IsTrue(result.SafetyFactorSpecified);
+        Assert.That(result.SafetyFactorSpecified, Is.True);
         Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance));
-        Assert.IsNotNull(result.UpliftSituation);
-        Assert.IsFalse(result.UpliftSituation.IsUplift);
+        Assert.That(result.UpliftSituation, Is.Not.Null);
+        Assert.That(result.UpliftSituation.IsUplift, Is.False);
         Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop));
         // Uplift Van
         result = output.Results.CalculationResults[1].StabilityDesignResults;
-        Assert.IsFalse(result.SafetyFactorSpecified);
-        Assert.IsNotNull(result.UpliftSituation);
+        Assert.That(result.SafetyFactorSpecified, Is.False);
+        Assert.That(result.UpliftSituation, Is.Not.Null);
         Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
         // Worst of Bishop and Uplift Van 
         result = output.Results.CalculationResults[2].StabilityDesignResults;
-        Assert.IsTrue(result.SafetyFactorSpecified);
+        Assert.That(result.SafetyFactorSpecified, Is.True);
         Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance));
-        Assert.IsNotNull(result.UpliftSituation);
+        Assert.That(result.UpliftSituation, Is.Not.Null);
         Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
 
         // Calculation Result
@@ -439,7 +439,7 @@
         // Calculation Result
         Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.RunFailed));
         // SafetyFactor not specified
-        Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified);
+        Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
 
         result = output.Results.CalculationResults[2];
         Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D"));
@@ -502,7 +502,7 @@
         // Uplift Van
         Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError));
         // SafetyFactor not specified
-        Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified);
+        Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
         Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
 
         result = output.Results.CalculationResults[5];
@@ -511,7 +511,7 @@
         // Bishop/Uplift Van
         Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError));
         // SafetyFactor not specified
-        Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified);
+        Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
         Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
     }
 
@@ -558,7 +558,7 @@
         string calcDir = engineInterface.DamProjectData.CalculationMap + "_SingleCore";
 
         engineInterface.DamProjectData.CalculationMap = calcDir;
-        Assert.IsNotNull(engineInterface.DamProjectData);
+        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
         calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir;
         if (Directory.Exists(calcDir))
         {
@@ -690,10 +690,10 @@
         // Note Bka: it already failed, with message "The preparation for this calculation failed".
         // Now for a different reason. Probably because DTH is not yet taken into account with testing/adjusting the data.
         const string message = "The error calculation message is not has expected.";
-        Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " +
-                                                                              "The calculation failed with error message 'Value cannot be null."), message);
-        Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " +
-                                                                              "The preparation for this calculation failed."), message);
+        Assert.That(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " +
+                                                                            "The calculation failed with error message 'Value cannot be null."), Is.True, message);
+        Assert.That(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " +
+                                                                            "The preparation for this calculation failed."), Is.True, message);
     }
 
     [Test, Ignore("This test is not yet implemented, waits on stix implementation.")]
@@ -773,7 +773,7 @@
         };
         foreach (string file in fileList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file)))
         {
-            Assert.IsTrue(File.Exists(file), file + " does not exist");
+            Assert.That(File.Exists(file), Is.True, file + " does not exist");
         }
     }
 
@@ -838,7 +838,7 @@
         };
         foreach (string file in fileList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file)))
         {
-            Assert.IsTrue(File.Exists(file), file + " does not exist");
+            Assert.That(File.Exists(file), Is.True, file + " does not exist");
         }
     }
 
@@ -907,7 +907,7 @@
         };
         foreach (string file in fileList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file)))
         {
-            Assert.IsTrue(File.Exists(file), file + " does not exist");
+            Assert.That(File.Exists(file), Is.True, file + " does not exist");
         }
     }
 
@@ -973,7 +973,7 @@
         };
         foreach (string file in existingFilesList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file)))
         {
-            Assert.IsTrue(File.Exists(file), file + " does not exist");
+            Assert.That(File.Exists(file), Is.True, file + " does not exist");
         }
 
         var noneExistingFilesList = new List<string>
@@ -987,7 +987,7 @@
         };
         foreach (string file in noneExistingFilesList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file)))
         {
-            Assert.IsFalse(File.Exists(file), file + " does exist");
+            Assert.That(File.Exists(file), Is.False, file + " does exist");
         }
     }