Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 4624)
@@ -74,12 +74,12 @@
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString, true, outputFileName);
 
-        Assert.AreEqual(2.321, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance);
-        Assert.AreEqual(2.321, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, tolerance);
+        Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(2.321).Within(tolerance));
+        Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, Is.EqualTo(2.321).Within(tolerance));
         // Following values were 0.590 in the previous DamLive version, but that has to do with how the 
         // reference level Su is handled in D-GeoStability 18.1 and D-GeoStability 15.1
-        Assert.AreEqual(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance);
-        Assert.AreEqual(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[1].Value, tolerance);
+        Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(2.326).Within(tolerance));
+        Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[1].Value, Is.EqualTo(2.326).Within(tolerance));
     }
 
     [TestCase(PipingModelType.Wti2017)]
@@ -106,10 +106,10 @@
 
         Output output = GeneralHelper.RunAfterInputValidation(engineInterface, false);
 
-        Assert.AreEqual(2, output.Results.CalculationMessages.Length);
-        Assert.AreEqual(MessageMessageType.Info, output.Results.CalculationMessages[0].MessageType);
-        Assert.AreEqual("There are 2 locations with sensor data", output.Results.CalculationMessages[0].Message1);
-        Assert.AreEqual(MessageMessageType.Error, output.Results.CalculationMessages[1].MessageType);
-        Assert.AreEqual("No segments with failure mechanism Piping present", output.Results.CalculationMessages[1].Message1);
+        Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2));
+        Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Info));
+        Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("There are 2 locations with sensor data"));
+        Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error));
+        Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("No segments with failure mechanism Piping present"));
     }
 }
\ No newline at end of file