Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs
===================================================================
diff -u -r4595 -r4627
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4595)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4627)
@@ -60,19 +60,19 @@
     public static Output RunAfterInputValidation(EngineInterface engineInterface, bool areResultsExpected = true, string outputXml = "")
     {
         // Validate input
-        Assert.IsNotNull(engineInterface.DamProjectData);
+        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
         string validationMessages = engineInterface.Validate();
         var extraValidationMessage = "";
         if (outputXml != "")
         {
             extraValidationMessage = ", see output xml in debugger";
         }
 
-        Assert.IsNull(validationMessages, "Validation should succeed but does not" + extraValidationMessage);
+        Assert.That(validationMessages, Is.Null, "Validation should succeed but does not" + extraValidationMessage);
 
         // Run calculation
         string outputString = engineInterface.Run();
-        Assert.IsNotNull(outputString);
+        Assert.That(outputString, Is.Not.Null);
         Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
         if (outputXml != "")
         {
@@ -84,7 +84,7 @@
         // Evaluate results
         if (!areResultsExpected)
         {
-            Assert.IsNull(output.Results.CalculationResults, "No results are expected");
+            Assert.That(output.Results.CalculationResults, Is.Null, "No results are expected");
             return output;
         }
 
@@ -111,7 +111,7 @@
             assertMessage = assertMessage + Environment.NewLine + calcMessage.Message1;
         }
 
-        Assert.IsNotNull(output.Results.CalculationResults, assertMessage);
+        Assert.That(output.Results.CalculationResults, Is.Not.Null, assertMessage);
         return output;
     }
 
@@ -124,7 +124,7 @@
             {
                 string assertMessage = "No results available due to dependency on 2D geometries (sti files) and the old " +
                                        "MacroStability kernel wrapper implementation";
-                Assert.IsNotNull(output.Results.CalculationResults, assertMessage);
+                Assert.That(output.Results.CalculationResults, Is.Not.Null, assertMessage);
             }
         }
     }
@@ -144,13 +144,13 @@
                 {
                     const string message = "After adapting the geometry, the calculated safety factor is less than the" +
                                            " required safety factor; this is unexpected.";
-                    Assert.IsTrue(fosCalculated >= fosRequired, message);
+                    Assert.That(fosCalculated, Is.GreaterThanOrEqualTo(fosRequired), message);
                 }
                 else
                 {
                     const string message = "As the design was not successful and had to stop, the calculated safety " +
                                            "factor should be less than the required safety factor but this is not the case.";
-                    Assert.IsTrue(fosRequired >= fosCalculated, message);
+                    Assert.That(fosRequired, Is.GreaterThanOrEqualTo(fosCalculated), message);
                 }
 
                 string fileName = calculationResult.BaseFileName;
@@ -161,9 +161,9 @@
             // The iterated file is created only for the stability mechanism (not for piping) to be opened in D-Stability
             if (engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType != FailureMechanismSystemType.Piping)
             {
-                Assert.IsTrue(isIteratedFilePresent, "The AnalyseType is set to AdaptGeometry in the input, however the geometry was " +
-                                                     "not adapted in any location. Either set the AnalysisType to NoAdaptation or " +
-                                                     "increase the required safety factor.");
+                Assert.That(isIteratedFilePresent, Is.True, "The AnalyseType is set to AdaptGeometry in the input, however the geometry was " +
+                                                            "not adapted in any location. Either set the AnalysisType to NoAdaptation or " +
+                                                            "increase the required safety factor.");
             }
         }
     }