Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r4236 -r4511
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 4236)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 4511)
@@ -78,7 +78,7 @@
         [Category("Integration")]
         public void CanLoadVersion_1_3_3_1()
         {
-            const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\Versions\V 1.3.3.1\HHNK\TPL_Hempolder.damx";
+            const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\V 1.3.3.1\HHNK\TPL_Hempolder.damx";
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(projectFilenameHhnk))
             {
                 Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType);
@@ -93,7 +93,7 @@
         [Category("Integration")]
         public void CanLoadVersion_1_5_1_7_ScenariosPLLineParameters()
         {
-            const string projectFilenameTutorialDesign = @"..\..\..\..\..\data\Dam\Versions\V 1.5.1.7\Tutorial Design\DAM Tutorial Design (Old 1.5.1.7).damx";
+            const string projectFilenameTutorialDesign = @"..\..\..\..\..\data\Dam\V 1.5.1.7\Tutorial Design\DAM Tutorial Design (Old 1.5.1.7).damx";
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(projectFilenameTutorialDesign))
             {
                 foreach (Location location in projectData.Locations)
@@ -111,7 +111,7 @@
         [Category("Integration")]
         public void CanLoadVersion_1_5_2_1()
         {
-            const string fullProjectFilename = @"..\..\..\..\..\data\Dam\Versions\V 1.5.2.1\HHNK\TPL_Hempolder.damx";
+            const string fullProjectFilename = @"..\..\..\..\..\data\Dam\V 1.5.2.1\HHNK\TPL_Hempolder.damx";
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
             {
                 Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType);
@@ -124,7 +124,7 @@
         [TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")]
         public void CanLoadVersion_14_1_1_14(string projectFilename, string expectedSoilbaseName, string locationName)
         {
-            const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 14.1.1.14\";
+            const string dataFolder = @"..\..\..\..\..\data\Dam\V 14.1.1.14\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -156,7 +156,7 @@
         // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
         public void CanLoadVersion_15_1_1_3(string projectFilename, string expectedSoilbaseName, string locationName)
         {
-            const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\";
+            const string dataFolder = @"..\..\..\..\..\data\Dam\V 15.1.1.3\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -199,7 +199,7 @@
         // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
         public void CanLoadVersion_18_1_3(string projectFilename, string expectedSoilbaseName, string locationName)
         {
-            const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 18.1.3\";
+            const string dataFolder = @"..\..\..\..\..\data\Dam\V 18.1.3\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -242,7 +242,7 @@
         [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")]
         public void CanLoadVersion_19_1_1(string projectFilename, string expectedSoilbaseName, string locationName)
         {
-            const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 19.1.1\";
+            const string dataFolder = @"..\..\..\..\..\data\Dam\V 19.1.1\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -273,10 +273,10 @@
 
         [Test]
         [Category("Integration")]
-        [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")]
-        [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 18.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")]
-        [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")]
-        [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 18.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")]
+        [TestCase(@"..\..\..\..\..\data\Dam\V 15.1.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")]
+        [TestCase(@"..\..\..\..\..\data\Dam\V 18.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")]
+        [TestCase(@"..\..\..\..\..\data\Dam\V 15.1.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")]
+        [TestCase(@"..\..\..\..\..\data\Dam\V 18.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")]
         public void GivenOldProjectFileWithCalculationResultsWhenLoadingThisFileThenResultsAreNotLoaded(
             string dataFolder, string projectFilename)
         {
@@ -300,7 +300,7 @@
         [Ignore("project uses Bishop which is not yet supported for MacroStability kernel.")]
         public void CanSaveAndLoadCurrentVersion()
         {
-            const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx";
+            const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx";
             const string projectFilenameCurrentVersion = @".\TPL_HempolderCurrent.damx";
 
             // HHNK (Hollands Noorderkwartier)