Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4129 -r4138
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4129)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4138)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Deltares.Dam.Application.Live;
 using Deltares.Dam.Data;
@@ -55,7 +54,8 @@
     [TearDown]
     public void TearDownFixture()
     {
-        //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 1);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 20);
     }
 
     [TearDown]
@@ -97,6 +97,7 @@
         List<TimeSerie> series = runner.OutputTimeSeriesCollection.Series;
 
         var seriesCount = 0;
+        var resultsCount = 0;
 
         string[] validParameterIDs = Enum.GetNames(typeof(TimeSerieParameters));
         foreach (TimeSerie timeSeries in series)
@@ -106,40 +107,37 @@
             // StabilityInside check
             if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
             {
+                resultsCount += timeSeries.Entries.Count;
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
                     Assert.AreEqual(1.548, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.725, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    // Following value was 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
-                    if (maxCores == 1)
-                    {
-                        Assert.AreEqual(1.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    }
-                    else
-                    {
-                        Assert.AreEqual(1.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    }
+                    Assert.AreEqual(1.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.649, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    // Following value was 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(1.317, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.462, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
             }
 
             seriesCount++;
         }
 
         Assert.IsTrue(seriesCount > 0, "No output time series");
+        Assert.IsTrue(resultsCount == 16, "Incorrect number of results");
     }
 
 }
\ No newline at end of file