Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamAuthorizationTest.cs
===================================================================
diff -u -r4070 -r4510
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamAuthorizationTest.cs	(.../DamAuthorizationTest.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamAuthorizationTest.cs	(.../DamAuthorizationTest.cs)	(revision 4510)
@@ -42,15 +42,16 @@
                 "20.0",
                 "21.0",
                 "22.0",
-                "23.0"
+                "23.0",
+                "24.0"
             };
         }
 
         public override IEnumerable<string> GetUnsupportedFeatureVersions()
         {
             return new[]
             {
-                "24.0"
+                "25.0"
             };
         }
     }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r4341 -r4510
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 4341)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 4510)
@@ -35,11 +35,13 @@
     [TestFixture]
     public class DataPluginImporterTests
     {
-        const string directoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
+        string directoryWithCsvFiles = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\GrootSallandBinnenwaarts\");
 
         //Project Invoer1 uses both a locations.csv and a cross section shapefile
-        const string invoer1DirectoryWithCsvFiles = @"..\..\..\..\..\data\DamEngineTestProjects\Invoer1\STBI - toDesign\csvfiles\";
-        const string invoer1DirectoryWithDataShapeFiles = @"..\..\..\..\..\data\DamEngineTestProjects\Invoer1\STBI - toDesign\shapefiles\";
+        string invoer1DirectoryWithCsvFiles = 
+            Path.Combine(Directory.GetCurrentDirectory(), @"TestData\Invoer1-STBI-toDesign\csvfiles\");
+        string invoer1DirectoryWithDataShapeFiles = 
+            Path.Combine(Directory.GetCurrentDirectory(), @"TestData\Invoer1-STBI-toDesign\shapefiles\");
         private const string Location1Id = "RK210-560";
         private const string Location2Id = "RK210-570";
 
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterBackgroundTests.cs
===================================================================
diff -u -r4214 -r4510
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterBackgroundTests.cs	(.../DataPluginImporterBackgroundTests.cs)	(revision 4214)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterBackgroundTests.cs	(.../DataPluginImporterBackgroundTests.cs)	(revision 4510)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Deltares.Dam.Data;
 using Deltares.Dam.Data.DataPlugins;
@@ -77,7 +78,8 @@
         public void FixtureSetup()
         {
             mocks = new MockRepository();
-            var testFile = new ShapeFileLocation(@"..\..\..\..\..\Data\ShapeFiles\Gemeenten.shp");
+            string testDataFolder = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShapeFiles\Gemeenten.shp");
+            var testFile = new ShapeFileLocation(testDataFolder);
             Assert.IsTrue(testFile.IsValid);
 
             dataSources = new List<DataSource>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r4285 -r4510
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4285)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4510)
@@ -579,6 +579,468 @@
         <None Update="TestData\StiImporter\Tutorial-1a 16.1.2.1.sti">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.fix">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.qix">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\ShapeFiles\Gemeenten.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\characteristicpoints.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\locations.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\modelparameters.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\nonwaterretainingobjects.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\scenarios.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\segments.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\soilprofiles.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\surfacelines.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\characteristicpoints.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\locations.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\modelparameters.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\scenarios.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\scenarios_UI.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\segments.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\soilmaterials.mdb">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\soilmaterials.mds">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\soilprofiles.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\surfacelines.csv">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\TauSigmaRRDDelfland.dat">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.cpg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Crosssection.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.qpj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL3.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL4.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL4.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL4.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL4.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL4.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\DampingFactorPL4.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.CPG">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\HR.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.cpg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Locationv2.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.cpg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\materiaaltypedijk.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\mbp.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\mbp.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\mbp.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\mbp.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\mbp.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\mbp.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\minimal_circle_depth.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\minimal_circle_depth.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\minimal_circle_depth.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\minimal_circle_depth.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\minimal_circle_depth.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PenetrationLength.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PenetrationLength.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PenetrationLength.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PenetrationLength.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PenetrationLength.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PenetrationLength.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLineCreationMethod.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLineCreationMethod.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLineCreationMethod.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLineCreationMethod.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLineCreationMethod.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.cpg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\PLLines.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.cpg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Polderpeilen.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\safety_factor_piping.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\safety_factor_piping.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\safety_factor_piping.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\safety_factor_piping.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\safety_factor_piping.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.qpj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\segmentnummering.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.qpj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\Sheetpile_length.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_piping.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_piping.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_piping.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_piping.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_piping.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_stability.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_stability.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_stability.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_stability.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\uplift_criterion_stability.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.CPG">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\VB.shp.xml">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.dbf">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.prj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.qpj">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.sbn">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.sbx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.shp">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.shx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\Invoer1-STBI-toDesign\shapefiles\winterstijg_zonderDSM.shp.DELF-EW-9VK8WF2.9232.6152.sr.lock">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamLiveAuthorizationTest.cs
===================================================================
diff -u -r4070 -r4510
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamLiveAuthorizationTest.cs	(.../DamLiveAuthorizationTest.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamLiveAuthorizationTest.cs	(.../DamLiveAuthorizationTest.cs)	(revision 4510)
@@ -44,15 +44,16 @@
                 "20.0",
                 "21.0",
                 "22.0",
-                "23.0"
+                "23.0",
+                "24.0"
             };
         }
 
         public override IEnumerable<string> GetUnsupportedFeatureVersions()
         {
             return new[]
             {
-                "24.0"
+                "25.0"
             };
         }
     }