Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3886)
@@ -94,12 +94,12 @@
 
         }
 
-        //[TestCase(PipingModelType.Bligh)] //ToDo add successful test for Bligh/SellmeijerVnk
+        //[TestCase(PipingModelType.Bligh)] //ToDo add succesfull test for Bligh/SellmeijerVnk
         //[TestCase(PipingModelType.SellmeijerVnk)]
         [TestCase(PipingModelType.Sellmeijer4Forces)]
         public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(PipingModelType pipingModel)
         {
-            const string calcDir = "TestFiles\\TestOperationalGrebbedijk";
+            const string calcDir = "TestOperationalGrebbedijk";
             const string workingDir = @"TestFiles\";
             const string baseTestDirectory = @".\";
             if (Directory.Exists(calcDir))
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 3886)
@@ -49,9 +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 workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -91,9 +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 workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_WtiSellmeijerRevisedDesignInputFile.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -141,9 +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 workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_WtiSellmeijerRevisedDesignHeightInputFile.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignHeightInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -185,9 +179,7 @@
             // Set Analysis type to "No Adaption"
             // Set model to Piping Sellmeijer Revised (WBI)
             // Select all locations
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"Rechter Diezedijk_WtiSellmeijerRevisedInputFile.xml";
+            const string fileName = @"TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -215,9 +207,7 @@
         public void CompareResultFromMultiCoreRunWithSingleCoreRun()
         {
             var calcDir = "TestWtiPipingSingleCore";
-            const string workingDir = @".\";
-            Directory.SetCurrentDirectory(workingDir);
-            var outputFileName = @"WtiPipingSingleCore.output.xml";
+            var outputFileName = @"TestFiles\WtiPipingSingleCore.output.xml";
             var output = RunTestProjectCores(calcDir, outputFileName, 1);
             var outputSingleCore = DamXmlSerialization.SaveOutputAsXmlString(output);
 
@@ -260,9 +250,7 @@
             // Set model to Piping Sellmeijer Revised (WBI)
             // Select first location (100)
             Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml";
+            const string fileName = @"TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.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 -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 3886)
@@ -76,7 +76,7 @@
         // The output of both runs must be the same
         public void CompareResultFromMultiCoreRunWithSingleCoreRun()
         {
-            var calcDir = "TestFiles\\TestOperationalIntegrationSingleCore";
+            var calcDir = "TestOperationalIntegrationSingleCore";
             var outputFileName = @"TestFiles\OperationalSet2SingleCore.output.xml";
             var output = RunTestProjectCores(calcDir, outputFileName, 1);
             var outputSingleCore = DamXmlSerialization.SaveOutputAsXmlString(output);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 3886)
@@ -85,7 +85,7 @@
         // The output of both runs must be the same
         public void CompareResultFromMultiCoreRunWithSingleCoreRun()
         {
-            var calcDir = "TestFiles\\TestOperationalPulauTekongSingleCore";
+            var calcDir = "TestOperationalPulauTekongSingleCore";
             var outputFileName = @"PulauTekongSingleCore.OutputFile.xml";
             var output = RunTestProjectCores(calcDir, outputFileName, 1);
             var outputSingleCore = DamXmlSerialization.SaveOutputAsXmlString(output);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
===================================================================
diff -u -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 3886)
@@ -95,8 +95,6 @@
             // Select Failure mechanism Piping and model Sellmeijer (VNK)
             // Set Analysis type to "Adapt geometry"
             // Change required safety factor piping to 1.01
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
             const string fileName = @"PipingVoorbeeld1_SellmeijerVNKDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -153,9 +151,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Select Failure mechanism Piping and model Sellmeijer (VNK)
             // Set Analysis type to "Adapt geometry"
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -181,9 +177,7 @@
             // Based on ".\data\DamEngineTestProjects\Invoer3\DeltaDijk\DeltaDijk normal.damx"
             // Select Failure mechanism Piping and model Sellmeijer (VNK)
             // Set Analysis type to "Adapt geometry"
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"DeltaDijkInvoer3VNKAdaptionShoulderLength.xml";
+            const string fileName = @"TestFiles\DeltaDijkInvoer3VNKAdaptionShoulderLength.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs
===================================================================
diff -u -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 3886)
@@ -45,9 +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 workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -95,9 +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 = @"PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml";
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
+            const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -154,9 +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 workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml";
+            const string fileName = @"TestFiles\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/PipingBlighTests.cs
===================================================================
diff -u -r3885 -r3886
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 3885)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 3886)
@@ -47,9 +47,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Select Failure mechanism Piping and model Bligh
             // Set Analysis type to "No Adaption"
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_BlighInputFile.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_BlighInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -104,9 +102,7 @@
             // Select Failure mechanism Piping and model Bligh
             // Set Analysis type to "No Adaption"
             // Select all locations
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"Rechter Diezedijk_BlighInputFile.xml";
+            const string fileName = @"TestFiles\Rechter Diezedijk_BlighInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -124,9 +120,7 @@
             // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx"
             // Select Failure mechanism Piping and model Bligh
             // Set Analysis type to "Adapt geometry"
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"PipingVoorbeeld1_BlighDesignInputFile.xml";
+            const string fileName = @"TestFiles\PipingVoorbeeld1_BlighDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -169,9 +163,7 @@
             // Select Failure mechanism Piping and model Bligh
             // Set Analysis type to "Adapt Geometry"
             // Select second location (101)
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"Rechter Diezedijk_BlighDesignInputFile_1Location.xml";
+            const string fileName = @"TestFiles\Rechter Diezedijk_BlighDesignInputFile_1Location.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -194,9 +186,7 @@
             // Select second location (101)
             // Set for this location in location scenario Required safety factor for piping to 8.0
             Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"Rechter Diezedijk_BlighFailedDesignInputFile_1Location.xml";
+            const string fileName = @"TestFiles\Rechter Diezedijk_BlighFailedDesignInputFile_1Location.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
@@ -221,9 +211,7 @@
             // Select Failure mechanism Piping and model Bligh
             // Set Analysis type to "Adapt Geometry"
             // Select first 5 locations (100, 101, 102, 103 and 104)
-            const string workingDir = @"TestFiles\";
-            Directory.SetCurrentDirectory(workingDir);
-            const string fileName = @"Rechter Diezedijk_BlighDesignInputFile.xml";
+            const string fileName = @"TestFiles\Rechter Diezedijk_BlighDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);