Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs
===================================================================
diff -u -r6557 -r6657
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs	(.../IssuesTests.cs)	(revision 6557)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs	(.../IssuesTests.cs)	(revision 6657)
@@ -46,10 +46,19 @@
     [TestCase("DWP_20", 24, 102, 79, 46, 1.523)]
     public void TestGeometryAndResultForIssueWithDwpsFromTutorial(string location, int surfaceCount, int curveCount, int pointCount, int surfaceLinePointCount, double safetyFactor)
     {
+        const string calcDir = "TestGeometryAndResultForIssueWithDwpsFromTutorial";
+        if (Directory.Exists(calcDir))
+        {
+            Directory.Delete(calcDir, true); // delete previous results
+        }
+        Directory.CreateDirectory(calcDir);
+
         string inputString = File.ReadAllText(tutorialStability2D);
         string[] locations = [location];
         inputString = XmlAdapter.SelectLocations(inputString, locations);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid");
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
         string outputName = "OutputFor" + location + ".xml";
         var engineInterface = new EngineInterface(inputString);
         //GeometryData geometry = engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0].SoilProfile2D.Geometry;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs
===================================================================
diff -u -r6406 -r6657
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs	(.../ShearStrengthModelsTests.cs)	(revision 6406)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs	(.../ShearStrengthModelsTests.cs)	(revision 6657)
@@ -54,8 +54,17 @@
         [Test]
         public void GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned()
         {
+            const string calcDir = "GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned";
+            if (Directory.Exists(calcDir))
+            {
+                Directory.Delete(calcDir, true); // delete previous results
+            }
+            Directory.CreateDirectory(calcDir);
+
             const string fileName = @"TestFiles\ShearStrengthModelsTests\InputFileShearStrengthModelsComparison.xml";
             string inputString = File.ReadAllText(fileName);
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
             Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
@@ -100,8 +109,17 @@
         [Test]
         public void GivenInvalidSigmaTauCurveNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage()
         {
+            const string calcDir = "GivenInvalidSigmaTauCurveNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage";
+            if (Directory.Exists(calcDir))
+            {
+                Directory.Delete(calcDir, true); // delete previous results
+            }
+            Directory.CreateDirectory(calcDir);
+
             const string fileName = @"TestFiles\ShearStrengthModelsTests\InputFileInvalidSigmaTauCurveNotStartingAt0.xml";
             string inputString = File.ReadAllText(fileName);
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
             Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
@@ -134,8 +152,17 @@
         [Test]
         public void GivenInvalidSuTableNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage()
         {
+            const string calcDir = "GivenInvalidSuTableNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage";
+            if (Directory.Exists(calcDir))
+            {
+                Directory.Delete(calcDir, true); // delete previous results
+            }
+            Directory.CreateDirectory(calcDir);
+
             const string fileName = @"TestFiles\ShearStrengthModelsTests\InputFileInvalidSuTableNotStartingAt0.xml";
             string inputString = File.ReadAllText(fileName);
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
             Output output = GeneralHelper.RunAfterInputValidation(inputString);