Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r6071 -r6072
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 6071)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 6072)
@@ -51,7 +51,7 @@
         // ToDo: "Fails when run with multicore, so for now set to 1 core"]
         //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
         maxCores = 1;
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
 
     [SetUp]
@@ -60,7 +60,7 @@
     [TearDown]
     public void TearDownFixture()
     {
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
 
     [Test]
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r6071 -r6072
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 6071)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 6072)
@@ -52,7 +52,7 @@
         // ToDo: "Fails when run with multicore, so for now set to 1 core"]
         //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
         maxCores = 1;
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
 
     [SetUp]
@@ -61,7 +61,7 @@
     [TearDown]
     public void TearDownFixture()
     {
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
 
     [Test]
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs
===================================================================
diff -u -r6071 -r6072
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 6071)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 6072)
@@ -57,13 +57,13 @@
         // ToDo: "Fails when run with multicore, so for now set to 1 core"]
         //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
         maxCores = 1;
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
 
     [TearDown]
     public void TearDownFixture()
     {
-        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores);
+        IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
 
     [SetUp]