Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r3886 -r3888
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3886)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3888)
@@ -100,7 +100,7 @@
         public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(PipingModelType pipingModel)
         {
             const string calcDir = "TestOperationalGrebbedijk";
-            const string workingDir = @"TestFiles\";
+            const string workingDir = @".\";
             const string baseTestDirectory = @".\";
             if (Directory.Exists(calcDir))
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs
===================================================================
diff -u -r3886 -r3888
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 3886)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 3888)
@@ -45,7 +45,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Select Failure mechanism Piping and model Sellmeijer 4-forces
             // Set Analysis type to "No Adaption"
-            const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml";
+            const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -93,7 +93,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Select Failure mechanism Piping and model Sellmeijer 4-forces
             // Set Analysis type to "Adapt geometry"
-            const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml";
+            const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -150,7 +150,7 @@
             // Select Failure mechanism Piping and model Sellmeijer 4-forces
             // Set Analysis type to "Adapt geometry"
             // Set DTH = 4.5 for location "profiel 1"
-            const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml";
+            const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r3886 -r3888
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 3886)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 3888)
@@ -49,7 +49,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Set Analysis type to "No Adaption"
             // Change Failure mechanism Piping to model Sellmeijer Revised (WBI)
-            const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml";
+            const string fileName = @"PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -89,7 +89,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Set Analysis type to "Adapt geometry"
             // Change Failure mechanism Piping to model Sellmeijer Revised (WBI)
-            const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignInputFile.xml";
+            const string fileName = @"PipingVoorbeeld1_WtiSellmeijerRevisedDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -137,7 +137,7 @@
             // Set Analysis type to "Adapt geometry"
             // Change Failure mechanism Piping to model Sellmeijer Revised (WBI)
             // Set DTH = 4.5 for location "profiel 1"
-            const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignHeightInputFile.xml";
+            const string fileName = @"PipingVoorbeeld1_WtiSellmeijerRevisedDesignHeightInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -179,7 +179,7 @@
             // Set Analysis type to "No Adaption"
             // Set model to Piping Sellmeijer Revised (WBI)
             // Select all locations
-            const string fileName = @"TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedInputFile.xml";
+            const string fileName = @"Rechter Diezedijk_WtiSellmeijerRevisedInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
===================================================================
diff -u -r3886 -r3888
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 3886)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 3888)
@@ -77,7 +77,7 @@
         public void CompareResultFromMultiCoreRunWithSingleCoreRun()
         {
             var calcDir = "TestOperationalIntegrationSingleCore";
-            var outputFileName = @"TestFiles\OperationalSet2SingleCore.output.xml";
+            var outputFileName = @"OperationalSet2SingleCore.output.xml";
             var output = RunTestProjectCores(calcDir, outputFileName, 1);
             var outputSingleCore = DamXmlSerialization.SaveOutputAsXmlString(output);