Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs
===================================================================
diff -u -r6114 -r6130
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 6114)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 6130)
@@ -54,8 +54,7 @@
     [SetUp]
     public void SetupFixture()
     {
-        // ToDo: "Fails when run with multicore, so for now set to 1 core"]
-        //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
+        // Fails when run with multicore, so run with 1 core only
         maxCores = 1;
         IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
@@ -71,7 +70,6 @@
 
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")] // "Fails when run with multicore"]
     public void CalculateStabilityInsideUpliftVanBeeSwarmUsingTestFilesHasExpectedResultsInOutputFile()
     {
         const double cTolerance = 0.0005;
@@ -212,7 +210,6 @@
 
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")] // "Fails when run with multicore"]
     public void OperationalBeeSwarmMultiCoreWithXmlInputFile()
     {
         const string inputFilename = "InputForDebuggingBeeSwarm.xml";
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r6114 -r6130
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 6114)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 6130)
@@ -49,8 +49,7 @@
     [SetUp]
     public void SetupFixture()
     {
-        // ToDo: "Fails when run with multicore, so for now set to 1 core"]
-        //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
+        // Fails when run with multicore, so run with 1 core only
         maxCores = 1;
         IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
@@ -66,7 +65,6 @@
 
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")] // "Fails when run with multicore"]
     public void CalculateStabilityInsideBishopGridUsingTestFilesHasExpectedResultsInOutputFile()
     {
         const double cTolerance = 0.0005;
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r6114 -r6130
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 6114)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 6130)
@@ -48,8 +48,7 @@
     [SetUp]
     public void SetupFixture()
     {
-        // ToDo: "Fails when run with multicore, so for now set to 1 core"]
-        //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
+        // Fails when run with multicore, so run with 1 core only
         maxCores = 1;
         IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
@@ -65,7 +64,6 @@
 
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")] // "Fails when run with multicore"]
     public void CalculateStabilityInsideUpliftVanGridUsingTestFilesHasExpectedResultsInOutputFile()
     {
         const double cTolerance = 0.0005;
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs
===================================================================
diff -u -r6114 -r6130
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs	(.../PipingWtiInsideTest.cs)	(revision 6114)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs	(.../PipingWtiInsideTest.cs)	(revision 6130)
@@ -33,12 +33,12 @@
 [Category("Integration")]
 public class PipingWtiInsideTest
 {
-    const string projectIntegrationFilename = @"DAMLive.damx";
-    const string input1AFilename = @"live.InputTimeSeriesMHW.xml";
-    const string output1AFilename = @"live.OutputTimeSeriesMHW.xml";
-    const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml";
+    private const string projectIntegrationFilename = @"DAMLive.damx";
+    private const string input1AFilename = @"live.InputTimeSeriesMHW.xml";
+    private const string output1AFilename = @"live.OutputTimeSeriesMHW.xml";
+    private const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml";
 
-    const string testWorkingFolder = @".\damLivePipingWtiWork";
+    private const string testWorkingFolder = @".\damLivePipingWtiWork";
     private const string testIntegrationDataFolder = @"..\..\TestData\IntegrationTests\PipingWti";
     private List<Location> locations;
     
@@ -48,8 +48,7 @@
     [SetUp]
     public void SetupFixture()
     {
-        // ToDo: "Fails when run with multicore, so for now set to 1 core"]
-        //maxCores = Math.Min(GeneralHelper.CMaxCores, Environment.ProcessorCount);
+        // Fails when run with multicore, so run with 1 core only
         maxCores = 1;
         IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + maxCores);
     }
@@ -65,7 +64,6 @@
     
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")] // "Fails when run with multicore"
     public void CalculatePipingInsideWt1ModelUsingTestFilesHasExpectedResultsInOutputFile()
     {
         const double cTolerance = 0.0005;