Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r4052 -r4231
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 4231)
@@ -38,7 +38,22 @@
     private const double tolerance = 0.0005;
     private const double novalue = -999.0;
     private const string stabilityOutsideFactor = "StabilityOutsideFactor";
-
+    private const string workingDir = @"TestFiles\";
+    private string oldWorkingDir;
+    
+    [SetUp]
+    public void TestFixtureSetup()
+    {
+        oldWorkingDir = Directory.GetCurrentDirectory();   
+        Directory.SetCurrentDirectory(workingDir);   
+    }
+    
+    [TearDown]
+    public void TestFixtureTearDown()
+    {
+        Directory.SetCurrentDirectory(oldWorkingDir);   
+    }
+    
     [Test]
     [Ignore("")]
     [Category(Categories.WorkInProgress)]
@@ -47,16 +62,13 @@
     public void Run_UsingTestFiles_HasExpectedResultsInOutputFile(string inputTestcaseFilename, double valueEntry1, double valueEntry2)
     {
         const string calcDir = "TestOperationalPulauTekong";
-        const string workingDir = @"TestFiles\";
         const string baseTestDirectory = @".\Operational\PulauTekong\";
         if (Directory.Exists(calcDir))
         {
             Directory.Delete(calcDir, true); // delete previous results
         }
 
         Directory.CreateDirectory(calcDir);
-        // Switch to TestFiles directory to check if DamLive can also run from another directory
-        Directory.SetCurrentDirectory(workingDir);
         // Based on "Deltares.DamLive.Tests.PulauTekongTest"
         string inputFileName = baseTestDirectory + inputTestcaseFilename;
         const string outputFileName = baseTestDirectory + @"PulauTekong.OutputFile.xml";
@@ -106,7 +118,7 @@
 
         Directory.CreateDirectory(calcDir);
 
-        const string baseTestDirectory = @".\TestFiles\Operational\PulauTekong\";
+        const string baseTestDirectory = @".\Operational\PulauTekong\";
         string inputFileName = baseTestDirectory + @"PulauTekong.InputFile.xml";
         string inputString = File.ReadAllText(inputFileName);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used