Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs
===================================================================
diff -u -r5737 -r5747
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 5737)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 5747)
@@ -248,5 +248,38 @@
             Directory.Delete(testWorkingFolder, recursive);
         }
     }
+
+    public static Output RunMultiCoreWithXmlInputFile(string mapTestFiles, DamProjectType damProjectType,
+                                                      int maxCores, string calcDir, string inputFilename, string outputFilename, 
+                                                      bool justOneScenario = false, bool expectedNoErrors = true)
+    {
+        if (Directory.Exists(calcDir))
+        {
+            Directory.Delete(calcDir, true); // delete previous results
+        }
+        Directory.CreateDirectory(calcDir);
+
+        string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
+        string inputString = File.ReadAllText(fullInputFilename);
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "MaxCalculationCores", maxCores.ToString());
+        var engineInterface = new EngineInterface(inputString);
+        if (justOneScenario)
+        {
+            engineInterface.DamProjectData.Dike.ClearLocationScenariosExceptFirst();
+        }
+        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
+        Assert.That(engineInterface.DamProjectData.DamProjectType, Is.EqualTo(damProjectType));
+
+        Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputFilename);
+        if (expectedNoErrors)
+        {
+            int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
+            Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation.");
+        }
+        return output;
+    }
     
+    
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs
===================================================================
diff -u -r5746 -r5747
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs	(.../OperationalMultiCoreTests.cs)	(revision 5746)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs	(.../OperationalMultiCoreTests.cs)	(revision 5747)
@@ -131,26 +131,8 @@
     
     private static Output RunOperationalMultiCoreWithXmlInputFile(int maxCores, string calcDir, string inputFilename, string outputFilename)
     {
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-        Directory.CreateDirectory(calcDir);
-
-        string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
-        string inputString = File.ReadAllText(fullInputFilename);
-        inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
-        inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
-        inputString = XmlAdapter.ChangeValueInXml(inputString, "MaxCalculationCores", maxCores.ToString());
-        var engineInterface = new EngineInterface(inputString);
-        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
-        Assert.That(engineInterface.DamProjectData.DamProjectType, Is.EqualTo(DamProjectType.Operational));
-
-        Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputFilename);
-
-        int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
-        Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation.");
-        return output;
+        return GeneralHelper.RunMultiCoreWithXmlInputFile(mapTestFiles, DamProjectType.Operational, 
+                                                          maxCores, calcDir, inputFilename, outputFilename);
     }
 
     private static void CheckNumberOfRealResults(Output output, int expectedNumberOfResults, int expectedNumberOfRealResults)
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r5737 -r5747
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 5737)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 5747)
@@ -245,32 +245,9 @@
     private static Output RunDesignMultiCoreWithXmlInputFile(int maxCores, string calcDir, string inputFilename, string outputFilename, 
                                                              bool justOneScenario = false, bool expectedNoErrors = true)
     {
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-        Directory.CreateDirectory(calcDir);
-
-        string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
-        string inputString = File.ReadAllText(fullInputFilename);
-        inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
-        inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
-        inputString = XmlAdapter.ChangeValueInXml(inputString, "MaxCalculationCores", maxCores.ToString());
-        var engineInterface = new EngineInterface(inputString);
-        if (justOneScenario)
-        {
-            engineInterface.DamProjectData.Dike.ClearLocationScenariosExceptFirst();
-        }
-        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
-        Assert.That(engineInterface.DamProjectData.DamProjectType, Is.EqualTo(DamProjectType.Design));
-
-        Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputFilename);
-        int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
-        if (expectedNoErrors)
-        {
-            Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation.");
-        }
-        return output;
+        return GeneralHelper.RunMultiCoreWithXmlInputFile(mapTestFiles, DamProjectType.Design, 
+                                                          maxCores, calcDir, inputFilename, outputFilename, 
+                                                          justOneScenario, expectedNoErrors);
     }
 
 }
\ No newline at end of file