Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs
===================================================================
diff -u -r5726 -r5754
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs	(.../DamLivePulauTekongTests.cs)	(revision 5726)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs	(.../DamLivePulauTekongTests.cs)	(revision 5754)
@@ -45,7 +45,6 @@
         GeneralHelper.InitializeRunner(runner, 1);
 
         runner.Run();
-        //runner.WriteResultsToFile(outputFile);
 
         // Assertions
         GeneralHelper.AssertNoErrors(runner);
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs
===================================================================
diff -u -r5726 -r5754
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs	(.../DamLiveHHNKTests.cs)	(revision 5726)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs	(.../DamLiveHHNKTests.cs)	(revision 5754)
@@ -44,7 +44,6 @@
         GeneralHelper.InitializeRunner(runner, 1);
 
         runner.Run();
-        //runner.WriteResultsToFile(outputFile);
 
         // Assertions
         GeneralHelper.AssertNoErrors(runner);
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs
===================================================================
diff -u -r5752 -r5754
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 5752)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 5754)
@@ -51,7 +51,7 @@
         const string outputFilename = @"live.OutputTimeSeries.xml";
         const string parametersFilename = @"live.ParametersFile.xml";
         SetupIntegrationProject("", testWorkingFolder, testIntegrationDataFolder, inputFilename, outputFilename,
-                                "", parametersFilename, projectIntegrationFilename, out runner, out locations);
+                                "test", parametersFilename, projectIntegrationFilename, out runner, out locations);
     }
     public static void SetupIntegrationProject(string postfix, string testWorkingFolder, string testIntegrationDataFolder, 
                                                string input1aFilename, string output1aFilename, string testFileName,
@@ -68,6 +68,7 @@
         string outputFile = Path.Combine(actualTestPath, output1aFilename);
         string parameterFile = Path.Combine(actualTestPath, calculationParametersIntegrationFilename);
         string projectFile = Path.Combine(actualTestPath, projectIntegrationFilename);
+        string testFile = Path.Combine(actualTestPath, testFileName);
         DamProject.SetTestProgramVersion("24.1");
         DamProjectData damData = DamProject.LoadData(projectFile);
         locations = damData.Locations;
@@ -85,7 +86,7 @@
             FewsOutputFile = new FileInfo(outputFile),
             Filter = "",
             InputTimeSeriesCollection = inputTimeSeries,
-            TestFileName = testFileName
+            TestFileName = testFile
         };
     }
 
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs
===================================================================
diff -u -r5723 -r5754
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 5723)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 5754)
@@ -362,7 +362,7 @@
         {
             Input input = FillXmlInputFromDamUi.CreateInput(DamProjectData);
 #if DEBUG
-            string inputFilename = TestFileName + "InputFile.xml";
+            string inputFilename = TestFileName + "Input.xml";
             DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input);
 #endif
             string inputXml = DamXmlSerialization.SaveInputAsXmlString(input);
@@ -378,7 +378,7 @@
                 Output output = DamXmlSerialization.LoadOutputFromXmlString(outputXml);
                 FillDamUiFromXmlOutput.AddOutputToDamProjectData(DamProjectData, output);
 #if DEBUG
-                string outputFilename = TestFileName + "OutputFile.xml";
+                string outputFilename = TestFileName + "Output.xml";
                 DamXmlSerialization.SaveOutputAsXmlFile(outputFilename, output);
 #endif
                 foreach (Message calculationMessage in output.Results.CalculationMessages)