Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r4137 -r4154
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4137)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4154)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Deltares.Dam.Application.Live;
 using Deltares.Dam.Data;
@@ -47,15 +48,15 @@
     [SetUp]
     public void SetupFixture()
     {
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 1); // to be sure no test directory exist from previous tests
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 20);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); // to be sure no test directory exist from previous tests
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
     }
 
     [TearDown]
     public void TearDownFixture()
     {
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 1);
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 20);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
     }
 
     [TearDown]
@@ -70,8 +71,8 @@
     [Test]
     [Category("Integration")]
     [Category("Work_In_Progress")]
-    [TestCase(1)]
-    [TestCase(20)]
+    [TestCase(GeneralHelper.CMinCores)]
+    [TestCase(GeneralHelper.CMaxCores)]
     public void CalculateStabilityInsideBishopGridUsingTestFilesHasExpectedResultsInOutputFile(int maxCores)
     {
         const double cTolerance = 0.0005;
@@ -86,7 +87,7 @@
         Assert.IsNotNull(runner.CalculationParameters);
         Assert.IsNotNull(runner.CalculationParameters.CalculationModules);
         Assert.IsNotNull(runner.CalculationParameters.MStabParameters);
-        runner.StabilityWorkingPath = "D:\test";
+        runner.StabilityWorkingPath = Path.GetTempPath();
 
         runner.Run();
         //runner.WriteResultsToFile(outputFile);
@@ -120,14 +121,7 @@
                     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");
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R")
@@ -143,7 +137,7 @@
         }
 
         Assert.IsTrue(seriesCount > 0, "No output time series");
-        Assert.IsTrue(resultsCount == 16, "Incorrect number of results");
+        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
     }