Index: DamClients/DamUI/trunk/src/Dam/Tests/IntersectionOnShapesTest.cs
===================================================================
diff -u -r4035 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/IntersectionOnShapesTest.cs	(.../IntersectionOnShapesTest.cs)	(revision 4035)
+++ DamClients/DamUI/trunk/src/Dam/Tests/IntersectionOnShapesTest.cs	(.../IntersectionOnShapesTest.cs)	(revision 4038)
@@ -36,8 +36,8 @@
         [Category("Slow")]
         public void AllIntersectionsWithTrafficLoad()
         {
-            const string crossSectionFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
-            const string trafficFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\TrafficLoad.shp";
+            const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
+            const string trafficFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\TrafficLoad.shp";
 
             FindAllIntersectionsDotSpatial(crossSectionFile, trafficFile);
         }
@@ -47,26 +47,26 @@
         [Ignore("Takes 25 minutes on buildserver")]
         public void AllIntersectionsWithPolderLevel()
         {
-            const string crossSectionFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
-            const string polderLevelFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\PolderLevel.shp";
+            const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
+            const string polderLevelFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\PolderLevel.shp";
 
             FindAllIntersectionsDotSpatial(crossSectionFile, polderLevelFile);
         }
 
         [Test]
         public void OneIntersectionWithTrafficLoad()
         {
-            const string crossSectionFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
-            const string trafficFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\TrafficLoad.shp";
+            const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
+            const string trafficFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\TrafficLoad.shp";
 
             FindFirstIntersectionDotSpatial(crossSectionFile, trafficFile);
         }
 
         [Test]
         public void OneIntersectionWithPolderLevel()
         {
-            const string crossSectionFile = @"..\..\..\data\Dam\Waterboards\HHNK\shapefiles\Crosssection.shp";
-            const string polderLevelFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\PolderLevel.shp";
+            const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\shapefiles\Crosssection.shp";
+            const string polderLevelFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\PolderLevel.shp";
 
             Debug.WriteLine("--- DotSpatial ---");
             FindFirstIntersectionDotSpatial(crossSectionFile, polderLevelFile);
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 4038)
@@ -52,11 +52,11 @@
                 Directory.Delete(tmpTestFolder, true);
         }
 
-        const string directoryWithCsvFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
+        const string directoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
 
         //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\";
+        const string invoer1DirectoryWithCsvFiles = @"..\..\..\..\..\data\DamEngineTestProjects\Invoer1\STBI - toDesign\csvfiles\";
+        const string invoer1DirectoryWithDataShapeFiles = @"..\..\..\..\..\data\DamEngineTestProjects\Invoer1\STBI - toDesign\shapefiles\";
         private const string Location1Id = "RK210-560";
         private const string Location2Id = "RK210-570";
 
@@ -675,7 +675,7 @@
             {
                 Directory.CreateDirectory(importFolder);
             }
-            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles");
+            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\csvfiles");
             File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv"));
@@ -753,7 +753,7 @@
             {
                 Directory.CreateDirectory(importFolder);
             }
-            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles");
+            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\csvfiles");
             File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv"));
@@ -831,8 +831,8 @@
             {
                 Directory.CreateDirectory(importFolder);
             }
-            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles");
-            var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\shapefiles");
+            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\csvfiles");
+            var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\shapefiles");
             File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv"));
@@ -916,8 +916,8 @@
             {
                 Directory.CreateDirectory(importFolder);
             }
-            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles");
-            var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\shapefiles");
+            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\csvfiles");
+            var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\shapefiles");
             File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv"));
@@ -1001,8 +1001,8 @@
             {
                 Directory.CreateDirectory(importFolder);
             }
-            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles");
-            var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\shapefiles");
+            var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\csvfiles");
+            var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HempolderImport\shapefiles");
             File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv"));
             File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv"));
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterBackgroundTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterBackgroundTests.cs	(.../DataPluginImporterBackgroundTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterBackgroundTests.cs	(.../DataPluginImporterBackgroundTests.cs)	(revision 4038)
@@ -45,7 +45,7 @@
         public void FixtureSetup()
         {
             mocks = new MockRepository();
-            var testFile = new ShapeFileLocation(@"..\..\..\Data\ShapeFiles\Gemeenten.shp");
+            var testFile = new ShapeFileLocation(@"..\..\..\..\..\Data\ShapeFiles\Gemeenten.shp");
             Assert.IsTrue(testFile.IsValid);
 
             dataSources = new List<DataSource>
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r4020 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4020)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4038)
@@ -2,12 +2,15 @@
   <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
     <Folder Include="Properties" />
-    <Folder Include="WTI\Deltares.Dam.DamWti.Tests" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Deltares.Authorization">
       <HintPath>..\..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
     </Reference>
+    <None Include="..\..\..\lib\Authorization\x86\dauth.dll">
+      <Link>dauth.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Reference Include="Deltares.DamEngine.Data">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
     </Reference>
@@ -41,17 +44,542 @@
     <Reference Include="DotSpatial.Data">
       <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Data.dll</HintPath>
     </Reference>
+    <Reference Include="DotSpatial.Topology">
+      <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Topology.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
+    <None Update="TestData\HoekscheWaardCsv\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\Description import files.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\locations_pluslatLong.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\modelparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\soilprofiles.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\stabsoilparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaardCsv\surfacelines_vertical.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\LocationID.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\LocationID.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\LocationID.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\LocationID.shp.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\soilprofiles.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ImporterTest\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\DamProjectTest\DamProjectTestMSoilbaseRead.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\Lijnscenarios.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\Log.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\Vlakscenario.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Crosssection.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Crosssection.sbn">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Crosssection.sbx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Crosssection.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Crosssection.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\LijnScenario.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\LijnScenario.prj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\LijnScenario.qpj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\LijnScenario.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\LijnScenario.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Locations.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Locations.prj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Locations.qpj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Locations.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Locations.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Segments.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Segments.prj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Segments.qpj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Segments.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\Segments.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\VlakScenario.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\VlakScenario.prj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\VlakScenario.qpj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\VlakScenario.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\shapefiles\VlakScenario.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\locations_basic.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\locations_complete.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\locations_empty.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\scenarios_basic.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\scenarios_complete.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\scenarios_empty.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\soilprofiles.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HempolderImport\csvfiles\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaard\input_dam.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\HoekscheWaard\input_dam_shortversion.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\modelparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\ResultsPipingDesign.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\soilprofiles.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\csvfiles\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\Import.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full1DProject\Import relative soilprofiles.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_005_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_024_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_041_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_054_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_066_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_090_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_102_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_117_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_117_STBI_dcb_diep.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_117_STBI_dcb_diep.sts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_130_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_130_STBI_dcb.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_130_STBI_dcb.sts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_149_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_157_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_165_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_165_STBI_dcb.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_165_STBI_dcb.sts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_181_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_186_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_199_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_228_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_258_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_258_STBI.sts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_275_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_282_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_286_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_311_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_327_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_352_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_358_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_369_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_380_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_390_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_390_STBI_dcb.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_390_STBI_dcb.sts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_400_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_400_STBI_dcb.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_421_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_432_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_460_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_475_STBI.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\modelparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\csvfiles\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\Full2DProject\Import.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\Import.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\modelparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\ResultsPipingDesign.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\soilprofiles.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\modelparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\ResultsPipingDesign.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\soilprofiles.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\csvfiles\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\CSVData\ProjectZoneType\Import.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\FillXMLInputFromDamUI\Profile2D 1.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\FillXMLInputFromDamUI\Profile2D 2.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\characteristicpoints.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\locations.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\modelparameters.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\scenarios.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\segments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\csvfiles\surfacelines.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP29_9.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP30_1.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP30_2.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP31_5.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP33_4.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP35_5.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Geometries\DP37_0.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Import.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\Sensors\Sensordata.xls">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\GeoFile.geo">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\InvalidGeometryVersion.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\InvalidSoilVersion.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\SeepFile.SEI">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\SimpleProfile.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\SimpleProfileWithException.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\Tutorial-1a 10.1.4.3.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\Tutorial-1a 14.1.2.1.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestData\StiImporter\Tutorial-1a 16.1.2.1.sti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
+    <ProjectReference Include="..\Deltares.Dam.TestHelper\Deltares.Dam.TestHelper.csproj" />
     <ProjectReference Include="..\Forms\Deltares.Dam.Forms.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CompareNETObjects" Version="3.3.0" />
+    <PackageReference Include="GeoAPI" Version="1.7.4" />
+    <PackageReference Include="NetTopologySuite" Version="1.14.0" />
     <PackageReference Include="RhinoMocks" Version="3.6.1" />
   </ItemGroup>
   <ItemGroup>
Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs	(.../LocationShapeFileImporterDotSpatialTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs	(.../LocationShapeFileImporterDotSpatialTests.cs)	(revision 4038)
@@ -34,7 +34,7 @@
         [Test]
         public void CanReadLoactions()
         {
-            const string locationFolder = @"..\..\..\data\Dam\Waterboards\HHNK\shapefiles";
+            const string locationFolder = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\shapefiles";
             var configuredAttributes = new List<DataAttribute>();
             configuredAttributes.Add(new DataAttribute{AttributeId = "location_id", AttributeName = "LOCATIONID", DataSource = "LocationID.shp" });
             configuredAttributes.Add(new DataAttribute { AttributeId = "dikering_id", AttributeName = "DIKERINGID", DataSource = "LocationID.shp" });
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs	(.../DataPluginImporterDataShapeFilesTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs	(.../DataPluginImporterDataShapeFilesTests.cs)	(revision 4038)
@@ -35,14 +35,14 @@
     {
         //Project Groot Salland does NOT use a cross section shapefile.
         //The values in the data shapefiles are found by coordinates of the locations that are defined in the locations.csv
-        const string DirectoryWithCsvFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
-        const string DirectoryWithDataShapeFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\GWS\gis-customdata\ShapeFiles\";
+        const string DirectoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
+        const string DirectoryWithDataShapeFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\GWS\gis-customdata\ShapeFiles\";
         private const string Location275Id = "dwp27_5";
         private const string Location475Id = "dwp47_5";
 
         //Project HHNK_WILMEBREEK does use a cross section shapefile
-        const string HHNK_WILMEBREEKDirectoryWithCsvFiles = @"..\..\..\data\DamEngineTestProjects\HHNK_WILMEBREEK\CSV Bestanden\";
-        const string HHNK_WILMEBREEKDirectoryWithDataShapeFiles = @"..\..\..\data\DamEngineTestProjects\HHNK_WILMEBREEK\Shapes\";
+        const string HHNK_WILMEBREEKDirectoryWithCsvFiles = @"..\..\..\..\..\data\DamEngineTestProjects\HHNK_WILMEBREEK\CSV Bestanden\";
+        const string HHNK_WILMEBREEKDirectoryWithDataShapeFiles = @"..\..\..\..\..\data\DamEngineTestProjects\HHNK_WILMEBREEK\Shapes\";
         private const string Location1Id = "WILM_1";
         private const string Location22Id = "WILM_22";
 
Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs	(.../LocationPropertyImporterTest.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs	(.../LocationPropertyImporterTest.cs)	(revision 4038)
@@ -37,7 +37,7 @@
     [TestFixture]
     public class LocationPropertyImporterTest
     {
-        const string DirectoryWithDataShapeFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\GWS\gis-customdata\ShapeFiles\";
+        const string DirectoryWithDataShapeFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\GWS\gis-customdata\ShapeFiles\";
         private const string TestShapeFile = "trafficload.shp";
         private LocationPropertyImporter importer;
 
Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 4038)
@@ -33,7 +33,7 @@
     [TestFixture]
     public class WaterBoardImporterTests
     {
-        private const string DirectoryWithCsvFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts";
+        private const string DirectoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts";
         private List<DataSource> srcDataSources;
         private DataPluginImporter dataPluginImporter;
         private DataSourceContainer dataSourceContainer;
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4038)
@@ -122,7 +122,7 @@
         {
             const double tolerance = 0.005;
             // Given MSoilbase Database
-            const string databaseFilename = @"DamProjectTest\DamProjectTestMSoilbaseRead.mdb";
+            const string databaseFilename = @"TestData\DamProjectTest\DamProjectTestMSoilbaseRead.mdb";
             using (var geoDatabase = new GeoDatabase(databaseFilename))
             {
                 // When Reading Soils
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs	(.../DataPluginImporterCsvTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs	(.../DataPluginImporterCsvTests.cs)	(revision 4038)
@@ -33,7 +33,7 @@
     [TestFixture]
     public class DataPluginImporterCsvTests
     {
-        const string directoryWithCsvFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
+        const string directoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
         private const string location18_6Id = "dwp18_6";
         private const string segment05_4Id = "segment_dijkring10_dwp05_4";
         private const string surfaceline40_0Id = "dijkring10_dwp40_0";
Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 4038)
@@ -197,7 +197,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\Versions\V 1.3.3.1\HHNK\TPL_Hempolder.damx";
             using (var projectData = ProjectLoader.LoadProjectData(projectFilenameHhnk))
             {
                 Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType);
@@ -243,7 +243,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\Versions\V 1.5.1.7\Tutorial Design\DAM Tutorial Design (Old 1.5.1.7).damx";
             using (var projectData = ProjectLoader.LoadProjectData(projectFilenameTutorialDesign))
             {
                 foreach (Location location in projectData.Locations)
@@ -261,7 +261,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\Versions\V 1.5.2.1\HHNK\TPL_Hempolder.damx";
             using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
             {
                 Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType);
@@ -274,7 +274,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\Versions\V 14.1.1.14\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -307,7 +307,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\Versions\V 15.1.1.3\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -351,7 +351,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\Versions\V 18.1.3\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -396,7 +396,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\Versions\V 19.1.1\";
             string fullProjectFilename = Path.Combine(dataFolder, projectFilename);
 
             using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename))
@@ -429,10 +429,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\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")]
         public void GivenOldProjectFileWithCalculationResultsWhenLoadingThisFileThenResultsAreNotLoaded(
             string dataFolder, string projectFilename)
         {
@@ -456,7 +456,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\Versions\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx";
             const string projectFilenameCurrentVersion = @".\TPL_HempolderCurrent.damx";
 
             // HHNK (Hollands Noorderkwartier)
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r4033 -r4038
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 4033)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 4038)
@@ -128,7 +128,7 @@
     <ProjectReference Include="..\Deltares.Maps\Deltares.Maps.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GeoAPI" Version="1.7.5" />
+    <PackageReference Include="GeoAPI" Version="1.7.4" />
     <PackageReference Include="NetTopologySuite" Version="1.14.0" />
     <PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
     <PackageReference Include="log4net" Version="2.0.3" />
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs
===================================================================
diff -u -r4030 -r4038
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs	(.../DamPipingBenchmarkTest.cs)	(revision 4030)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs	(.../DamPipingBenchmarkTest.cs)	(revision 4038)
@@ -94,7 +94,7 @@
         public void Bm01OneAquiferOneLayer()
         {
              
-            string projectFilename = @"..\..\..\data\Dam\Benchmarks\Piping\Test 1\Integratietest piping 1.damx";
+            string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 1\Integratietest piping 1.damx";
 
             var allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0);
             double expectedPipingFactor = 0.506; // This is calculated according to spreadsheet
@@ -161,7 +161,7 @@
         [Test]
         public void Bm02OneAquiferTwoLayers()
         {
-            string projectFilename = @"..\..\..\data\Dam\Benchmarks\Piping\Test 2\Integratietest piping 2.damx";
+            string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 2\Integratietest piping 2.damx";
 
             var allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0);
             double expectedPipingFactor = 0.489; // This is calculated according to spreadsheet
@@ -185,7 +185,7 @@
         [Test]
         public void Bm03OneAquiferThreeLayers()
         {
-            string projectFilename = @"..\..\..\data\Dam\Benchmarks\Piping\Test 3\Integratietest piping 3.damx";
+            string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 3\Integratietest piping 3.damx";
 
             var allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0);
             double expectedPipingFactor = 0.494; // This is calculated according to spreadsheet
@@ -209,7 +209,7 @@
         [Test]
         public void Bm04TwoAquifersOneLayer()
         {
-            string projectFilename = @"..\..\..\data\Dam\Benchmarks\Piping\Test 4\Integratietest piping 4.damx";
+            string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 4\Integratietest piping 4.damx";
 
             var allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0);
             double expectedPipingFactor = 0.608; // This is calculated according to spreadsheet
@@ -233,7 +233,7 @@
         [Test]
         public void Bm05TwoAquifersTwoLayers()
         {
-            string projectFilename = @"..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx";
+            string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx";
 
             var allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0);
             double expectedPipingFactor = 0.618; // This is calculated according to spreadsheet
@@ -263,7 +263,7 @@
         public void Bm06TwoAquifersTwoLayersWithDifferentDistanceToEntryPoint(double distanceToEntryPoint, double expectedWtiPipingFactor, 
             double expectedSeepageLength, double expectedHc, double expectedCCreep)
         {
-            string projectFilename = @"..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx";
+            string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx";
 
             var allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, distanceToEntryPoint);
             double expectedPipingFactor = 0.618; // This is calculated according to spreadsheet
Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LineAttributeImporterTest.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LineAttributeImporterTest.cs	(.../LineAttributeImporterTest.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LineAttributeImporterTest.cs	(.../LineAttributeImporterTest.cs)	(revision 4038)
@@ -162,8 +162,8 @@
         [Category("Integration")]
         public void PerformanceOfImport_UsingSmallList_IsAcceptable()
         {
-            const string crossSectionFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
-            const string attributeFile = @"..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\DampingFactorPL3.shp";
+            const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp";
+            const string attributeFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\DampingFactorPL3.shp";
 
             var locations = new List<CsvImporterLocations.LocationRecord>
                                 {
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs
===================================================================
diff -u -r3896 -r4038
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs	(.../DataPluginImporterMGeobaseTests.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterMGeobaseTests.cs	(.../DataPluginImporterMGeobaseTests.cs)	(revision 4038)
@@ -33,7 +33,7 @@
     [TestFixture]
     public class DataPluginImporterMGeobaseTests
     {
-        const string MGeobaseDatabase = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\Vb.mdb";
+        const string MGeobaseDatabase = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\Vb.mdb";
         List<DataSource> srcMGBDataSources;
         DataPluginImporter dataMGBPluginImporter;
 
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r4028 -r4038
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 4028)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 4038)
@@ -53,12 +53,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
-    <ProjectReference Include="TestHelper\Deltares.Dam.TestHelper.csproj" />
+    <ProjectReference Include="..\Deltares.Dam.TestHelper\Deltares.Dam.TestHelper.csproj" />
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Remove="System.Threading.Tasks.Extensions" />
     <PackageReference Include="CompareNETObjects" Version="3.3.0" />
+    <PackageReference Include="GeoAPI" Version="1.7.4" />
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/Deltares.Dam.Specifications.Tests.csproj
===================================================================
diff -u -r4025 -r4038
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 4025)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 4038)
@@ -8,6 +8,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
   </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj
===================================================================
diff -u -r4022 -r4038
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 4022)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 4038)
@@ -5,31 +5,31 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Deltares.DamEngine.Data">
-      <HintPath>..\..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
+      <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Standard">
-      <HintPath>..\..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geographic">
-      <HintPath>..\..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geometry">
-      <HintPath>..\..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geotechnics">
-      <HintPath>..\..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geotechnics.IO">
-      <HintPath>..\..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Soilbase">
-      <HintPath>..\..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
-    <ProjectReference Include="..\..\..\DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj" />
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj" />
   </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r4030 -r4038
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs	(.../DamCalculationBenchmarkTest.cs)	(revision 4030)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs	(.../DamCalculationBenchmarkTest.cs)	(revision 4038)
@@ -215,7 +215,7 @@
         [Category("Slow")]
         public void Dijkring13NormalStabilityCalculation()
         {
-            const string cDikeFolder = @"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\Dijkring13-Sec1\Databronbestand.damx";
+            const string cDikeFolder = @"..\..\..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\Dijkring13-Sec1\Databronbestand.damx";
             List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cDikeFolder, MStabModelType.Bishop, 1);
 
             // Following values are just taken from the Geo Stability calculation and not manually calculated
@@ -232,7 +232,7 @@
         public void BMStabilityInwardsNoAdaptation()
         {
             string cFolderName =
-                @"..\..\..\data\Dam\\Benchmarks\Validatie UpliftVan\StabilityInwards-NoAdaptation\Databronbestand.damx";
+                @"..\..\..\..\..\data\Dam\\Benchmarks\Validatie UpliftVan\StabilityInwards-NoAdaptation\Databronbestand.damx";
             List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.UpliftVan, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/Deltares.Dam.BenchmarkTests.csproj
===================================================================
diff -u -r4030 -r4038
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/Deltares.Dam.BenchmarkTests.csproj	(.../Deltares.Dam.BenchmarkTests.csproj)	(revision 4030)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/Deltares.Dam.BenchmarkTests.csproj	(.../Deltares.Dam.BenchmarkTests.csproj)	(revision 4038)
@@ -1,156 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.13.3\build\NUnit.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.Dam.Tests</RootNamespace>
-    <AssemblyName>Deltares.Dam.BenchmarkTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <Folder Include="Properties" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DamCalculationBenchmarkTest.cs" />
-    <Compile Include="DamPipingBenchmarkTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
-      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="TestHelper\Deltares.Dam.TestHelper.csproj">
-      <Project>{d312a703-f6cf-4bec-b5c5-4e9c161d2010}</Project>
-      <Name>Deltares.Dam.TestHelper</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Deltares.DamEngine.Interface, Version=17.1.0.740, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.DamEngine.Interface">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.DamEngine.Io, Version=17.1.0.740, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.DamEngine.Io">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geographic">
       <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Standard">
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Copying.GPL.licenseheader">
-      <Link>Copying.GPL.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
+    <ProjectReference Include="..\Deltares.Dam.TestHelper\Deltares.Dam.TestHelper.csproj" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.3\build\NUnit.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
Index: DamClients/DamUI/trunk/src/Dam.sln
===================================================================
diff -u -r4020 -r4038
--- DamClients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 4020)
+++ DamClients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 4038)
@@ -35,26 +35,6 @@
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.BenchmarkTests", "Dam\Tests\Deltares.Dam.BenchmarkTests.csproj", "{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.IntegrationTests", "Dam\Tests\Deltares.Dam.IntegrationTests.csproj", "{3929C2AB-5F5B-40A1-8D77-6303AEE7976B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Specifications.Tests", "Dam\Tests\Specifications\Specifications\Deltares.Dam.Specifications.Tests.csproj", "{D092C06D-9CE6-48CF-8453-637FCCE8B371}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.TestHelper", "Dam\Tests\TestHelper\Deltares.Dam.TestHelper.csproj", "{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Tests", "Dam\Tests\Deltares.Dam.Tests.csproj", "{15503BE5-7148-4DA6-BDD0-5880266E79D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
@@ -80,6 +60,14 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "DamClientsLibrary\Deltares.Maps.Tests\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Specifications.Tests", "Dam\Deltares.Dam.Specifications.Tests\Deltares.Dam.Specifications.Tests.csproj", "{F72029C2-2597-4E4D-B9B6-5B90A9B542EB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.BenchmarkTests", "Dam\Deltares.Dam.BenchmarkTests\Deltares.Dam.BenchmarkTests.csproj", "{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.IntegrationTests", "Dam\Deltares.Dam.IntegrationTests\Deltares.Dam.IntegrationTests.csproj", "{59D8BC34-81F4-4521-B011-08CE41B448A7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.TestHelper", "Dam\Deltares.Dam.TestHelper\Deltares.Dam.TestHelper.csproj", "{4250BDBE-1131-4C42-89FC-6BE73972313C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -98,22 +86,6 @@
 		{03810024-8D4D-4726-9C4A-4A6886651CAB}.Debug|x86.Build.0 = Debug|x86
 		{03810024-8D4D-4726-9C4A-4A6886651CAB}.Release|x86.ActiveCfg = Release|x86
 		{03810024-8D4D-4726-9C4A-4A6886651CAB}.Release|x86.Build.0 = Release|x86
-		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Debug|x86.ActiveCfg = Debug|x86
-		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Debug|x86.Build.0 = Debug|x86
-		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Release|x86.ActiveCfg = Release|x86
-		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Release|x86.Build.0 = Release|x86
-		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B}.Debug|x86.ActiveCfg = Debug|x86
-		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B}.Debug|x86.Build.0 = Debug|x86
-		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B}.Release|x86.ActiveCfg = Release|x86
-		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B}.Release|x86.Build.0 = Release|x86
-		{D092C06D-9CE6-48CF-8453-637FCCE8B371}.Debug|x86.ActiveCfg = Debug|x86
-		{D092C06D-9CE6-48CF-8453-637FCCE8B371}.Debug|x86.Build.0 = Debug|x86
-		{D092C06D-9CE6-48CF-8453-637FCCE8B371}.Release|x86.ActiveCfg = Release|x86
-		{D092C06D-9CE6-48CF-8453-637FCCE8B371}.Release|x86.Build.0 = Release|x86
-		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}.Debug|x86.ActiveCfg = Debug|x86
-		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}.Debug|x86.Build.0 = Debug|x86
-		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}.Release|x86.ActiveCfg = Release|x86
-		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}.Release|x86.Build.0 = Release|x86
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4}.Debug|x86.ActiveCfg = Debug|x86
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4}.Debug|x86.Build.0 = Debug|x86
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4}.Release|x86.ActiveCfg = Release|x86
@@ -140,6 +112,22 @@
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86
+		{F72029C2-2597-4E4D-B9B6-5B90A9B542EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F72029C2-2597-4E4D-B9B6-5B90A9B542EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{F72029C2-2597-4E4D-B9B6-5B90A9B542EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{F72029C2-2597-4E4D-B9B6-5B90A9B542EB}.Release|x86.Build.0 = Release|Any CPU
+		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Debug|x86.ActiveCfg = Debug|x86
+		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Debug|x86.Build.0 = Debug|x86
+		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Release|x86.ActiveCfg = Release|x86
+		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058}.Release|x86.Build.0 = Release|x86
+		{59D8BC34-81F4-4521-B011-08CE41B448A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59D8BC34-81F4-4521-B011-08CE41B448A7}.Debug|x86.Build.0 = Debug|Any CPU
+		{59D8BC34-81F4-4521-B011-08CE41B448A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{59D8BC34-81F4-4521-B011-08CE41B448A7}.Release|x86.Build.0 = Release|Any CPU
+		{4250BDBE-1131-4C42-89FC-6BE73972313C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4250BDBE-1131-4C42-89FC-6BE73972313C}.Debug|x86.Build.0 = Debug|Any CPU
+		{4250BDBE-1131-4C42-89FC-6BE73972313C}.Release|x86.ActiveCfg = Release|Any CPU
+		{4250BDBE-1131-4C42-89FC-6BE73972313C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -149,10 +137,6 @@
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC}
 		{03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
-		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{D092C06D-9CE6-48CF-8453-637FCCE8B371} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
@@ -161,6 +145,10 @@
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
 		{F6A85256-50BA-4E97-8E3C-D8D488DFAF44} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
+		{F72029C2-2597-4E4D-B9B6-5B90A9B542EB} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
+		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
+		{59D8BC34-81F4-4521-B011-08CE41B448A7} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
+		{4250BDBE-1131-4C42-89FC-6BE73972313C} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B7622D89-F347-4835-A5C0-2E126540024A}
Index: DamClients/DamUI/trunk/packages/RhinoMocks.3.6.1/RhinoMocks.3.6.1.nupkg
===================================================================
diff -u -r875 -r4038
Binary files differ
Index: DamClients/DamUI/trunk/packages/RhinoMocks.3.6.1/lib/net/Rhino.Mocks.dll
===================================================================
diff -u -r875 -r4038
Binary files differ
Fisheye: Tag 4038 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/packages/RhinoMocks.3.6.1/RhinoMocks.3.6.1.nuspec'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4038 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/packages/RhinoMocks.3.6.1/lib/net/Rhino.Mocks.xml'.
Fisheye: No comparison available.  Pass `N' to diff?