Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs
===================================================================
diff -u -r4164 -r4166
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4164)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4166)
@@ -56,12 +56,6 @@
         IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
     }
 
-    [TearDown]
-    public void TearDownTest()
-    {
-        GeneralHelper.AssertNoErrors(runner);
-    }
-
     [SetUp]
     public void SetupTest() {}
 
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r4164 -r4166
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4164)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4166)
@@ -55,16 +55,10 @@
     [TearDown]
     public void TearDownFixture()
     {
-        //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores);
-        //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
     }
 
-    [TearDown]
-    public void TearDownTest()
-    {
-        GeneralHelper.AssertNoErrors(runner);
-    }
-
     [SetUp]
     public void SetupTest() {}
 
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4164 -r4166
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4164)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4166)
@@ -58,12 +58,6 @@
         IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
     }
 
-    [TearDown]
-    public void TearDownTest()
-    {
-        GeneralHelper.AssertNoErrors(runner);
-    }
-
     [SetUp]
     public void SetupTest() {}
 
@@ -112,7 +106,7 @@
                     Assert.AreEqual(1.456, firstEntry.Value, 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.AreEqual(1.583, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
@@ -122,7 +116,7 @@
                     Assert.AreEqual(1.366, firstEntry.Value, 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.AreEqual(1.480, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
@@ -132,7 +126,7 @@
                     Assert.AreEqual(1.248, firstEntry.Value, 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.AreEqual(1.359, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
@@ -141,7 +135,7 @@
                     Assert.AreEqual(1.172, firstEntry.Value, 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.AreEqual(1.271, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                     resultsCount++;
                 }