Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs
===================================================================
diff -u -r4136 -r4153
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs	(.../PipingWtiInsideTest.cs)	(revision 4136)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs	(.../PipingWtiInsideTest.cs)	(revision 4153)
@@ -45,15 +45,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]
@@ -68,8 +68,8 @@
     [Test]
     [Category("Integration")]
     [Category("Work_In_Progress")]
-    [TestCase(1)]
-    [TestCase(20)]
+    [TestCase(GeneralHelper.CMinCores)]
+    [TestCase(GeneralHelper.CMaxCores)]
     public void CalculatePipingInsideWt1ModelUsingTestFilesHasExpectedResultsInOutputFile(int maxCores)
     {
         const double cTolerance = 0.0005;
@@ -134,7 +134,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");
     }
 
 }
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs
===================================================================
diff -u -r4124 -r4153
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4124)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4153)
@@ -30,6 +30,9 @@
 
 public class GeneralHelper
 {
+    public const int CMinCores = 1;
+    public const int CMaxCores = 20;
+    
     public static void SetupIntegrationProject(int maxCores, string testWorkingFolder, string testIntegrationDataFolder, 
                                                string input1aFilename, string output1aFilename, 
                                                string calculationParametersIntegrationFilename, string projectIntegrationFilename,
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4138 -r4153
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4138)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4153)
@@ -47,15 +47,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 +70,8 @@
     [Test]
     [Category("Integration")]
     [Category("Work_In_Progress")]
-    [TestCase(1)]
-    [TestCase(20)]
+    [TestCase(GeneralHelper.CMinCores)]
+    [TestCase(GeneralHelper.CMaxCores)]
     public void CalculateStabilityInsideUpliftVanGridUsingTestFilesHasExpectedResultsInOutputFile(int maxCores)
     {
         const double cTolerance = 0.0005;
@@ -137,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");
     }
 
 }
\ No newline at end of file