Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs
===================================================================
diff -u -r950 -r992
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs	(.../MacroStabilityTests.cs)	(revision 950)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs	(.../MacroStabilityTests.cs)	(revision 992)
@@ -43,15 +43,15 @@
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
             // with Dam Classic rev.833
-            const string outDir = "TestOutStabBishop";
-            if (Directory.Exists(outDir))
+            const string calcDir = "TestOutStabBishop";
+            if (Directory.Exists(calcDir))
             {
-                Directory.Delete(outDir, true); // delete previous results
+                Directory.Delete(calcDir, true); // delete previous results
             }
-            var workingDir = Path.Combine(Directory.GetCurrentDirectory(), outDir);
             const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            inputString = ChangeValueInXml(inputString, "ProjectWorkingPath", workingDir);
+            inputString = ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
             inputString = ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\");
             inputString = ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -69,16 +69,16 @@
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
             // with Dam Classic rev.833
-            const string outDir = "TestOutStabUpliftVan";
-            if (Directory.Exists(outDir))
+            const string calcDir = "TestOutStabUpliftVan";
+            if (Directory.Exists(calcDir))
             {
-                Directory.Delete(outDir, true); // delete previous results
+                Directory.Delete(calcDir, true); // delete previous results
             }
-            var workingDir = Path.Combine(Directory.GetCurrentDirectory(), outDir);
             const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = ChangeInputModel(inputString, InputStabilityModelType.UpliftVan);
-            inputString = ChangeValueInXml(inputString, "ProjectWorkingPath", workingDir);
+            inputString = ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
             inputString = ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\");
             inputString = ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
             EngineInterface engineInterface = new EngineInterface(inputString);
@@ -96,16 +96,16 @@
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
             // with Dam Classic rev.833
-            const string outDir = "TestOutStabBishopUpliftVan";
-            if (Directory.Exists(outDir))
+            const string calcDir = "TestOutStabBishopUpliftVan";
+            if (Directory.Exists(calcDir))
             {
-                Directory.Delete(outDir, true); // delete previous results
+                Directory.Delete(calcDir, true); // delete previous results
             }
-            var workingDir = Path.Combine(Directory.GetCurrentDirectory(), outDir);
             const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
-            inputString = ChangeValueInXml(inputString, "ProjectWorkingPath", workingDir);
+            inputString = ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
             inputString = ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\");
             inputString = ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
             EngineInterface engineInterface = new EngineInterface(inputString);