Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4611 -r4626
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4611)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4626)
@@ -96,87 +96,87 @@
         string[] validParameterIDs = Enum.GetNames(typeof(TimeSerieParameters));
         foreach (TimeSerie timeSeries in series)
         {
-            Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId));
-            Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId));
+            Assert.That(validParameterIDs.Any(n => n == timeSeries.ParameterId), Is.True);
+            Assert.That(locations.Any(l => l.Name == timeSeries.LocationId), Is.True);
             // StabilityInside check
             if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
             {
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.456, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.456).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.583, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.583).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.366, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.366).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.480, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.480).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.248, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.248).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.359, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.359).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.172, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.172).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.271, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.271).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++;
                 }
 
@@ -185,8 +185,8 @@
             seriesCount++;
         }
 
-        Assert.IsTrue(seriesCount > 0, "No output time series");
-        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
+        Assert.That(seriesCount > 0, Is.True, "No output time series");
+        Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results");
     }
 
 }
\ No newline at end of file