Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs
===================================================================
diff -u -r4220 -r5721
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4220)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 5721)
@@ -32,13 +32,32 @@
 {
     public const int CMinCores = 1;
     public const int CMaxCores = 20;
-    
-    public void SetupIntegrationProject(int maxCores, string testWorkingFolder, string testIntegrationDataFolder, 
+
+    public static void SetupIntegrationProject(int maxCores, string testWorkingFolder, string testIntegrationDataFolder,
                                                string input1aFilename, string output1aFilename, string testFileName,
                                                string calculationParametersIntegrationFilename, string projectIntegrationFilename,
                                                out DamEngineRunner runner, out List<Location> locations)
     {
-        string actualTestPath = Path.GetFullPath(testWorkingFolder + maxCores.ToString());
+        string postfix = maxCores == 0 ? "" : maxCores.ToString();
+        SetupIntegrationProject(postfix, testWorkingFolder, testIntegrationDataFolder, input1aFilename, output1aFilename,
+                                testFileName, calculationParametersIntegrationFilename, projectIntegrationFilename, out runner, out locations);
+    }
+    public static void SetupIntegrationProject(string testWorkingFolder, string testIntegrationDataFolder,
+                                               string projectIntegrationFilename,
+                                               out DamEngineRunner runner, out List<Location> locations)
+    {
+        const string inputFilename = @"live.InputTimeSeries.xml";
+        const string outputFilename = @"live.OutputTimeSeries.xml";
+        const string parametersFilename = @"live.ParametersFile.xml";
+        SetupIntegrationProject("", testWorkingFolder, testIntegrationDataFolder, inputFilename, outputFilename,
+                                "", parametersFilename, projectIntegrationFilename, out runner, out locations);
+    }
+    public static void SetupIntegrationProject(string postfix, string testWorkingFolder, string testIntegrationDataFolder, 
+                                               string input1aFilename, string output1aFilename, string testFileName,
+                                               string calculationParametersIntegrationFilename, string projectIntegrationFilename,
+                                               out DamEngineRunner runner, out List<Location> locations)
+    {
+        string actualTestPath = Path.GetFullPath(testWorkingFolder + postfix);
 
         Directory.CreateDirectory(actualTestPath);
 
@@ -48,7 +67,7 @@
         string outputFile = Path.Combine(actualTestPath, output1aFilename);
         string parameterFile = Path.Combine(actualTestPath, calculationParametersIntegrationFilename);
         string projectFile = Path.Combine(actualTestPath, projectIntegrationFilename);
-        DamProject.SetTestProgramVersion("23.1");
+        DamProject.SetTestProgramVersion("24.1");
         DamProjectData damData = DamProject.LoadData(projectFile);
         locations = damData.Locations;
 
@@ -68,8 +87,25 @@
             TestFileName = testFileName
         };
     }
+
+    public static void InitializeRunner(DamEngineRunner runner, int maxCores)
+    {
+        runner.Initialize();
+        runner.DamProjectData.MaxCalculationCores = maxCores;
+        Assert.That(runner, Is.Not.Null);
+        Assert.Multiple(() =>
+        {
+            Assert.That(runner.DamProjectData, Is.Not.Null);
+            Assert.That(runner.CalculationParameters, Is.Not.Null);
+        });
+        Assert.Multiple(() =>
+        {
+            Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null);
+            Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null);
+        });
+    }
     
-    public void AssertNoErrors(DamEngineRunner runner)
+    public static void AssertNoErrors(DamEngineRunner runner)
     {
         if (runner.HasErrors)
         {