Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r5806 -r5967
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 5806)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 5967)
@@ -50,124 +50,19 @@
         <Reference Include="DGeoSuite.Components.Persistence">
             <HintPath>..\..\..\lib\DamEngine\DGeoSuite.Components.Persistence.dll</HintPath>
         </Reference>
-        <None Update="TestData\CSVData\ImporterTest\aquifers.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
+    </ItemGroup>
+    <ItemGroup>
         <None Update="TestData\Geometry2DImporter\DWP_1.stix">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Update="TestData\Geometry2DImporter\DWP_Aquifer.stix">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\CSVData\Full2DProject\csvfiles\aquifers.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProject\csvfiles\sutables.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\characteristicpoints.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\locations.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\modelparameters.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\scenarios.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\segments.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\sigmataucurves.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\soilprofiles.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\soils.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\surfacelines.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\Import.defx">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\characteristicpoints.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\locations.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\modelparameters.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\scenarios.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\segments.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\sigmataucurves.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\soilprofiles.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\soils.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\surfacelines.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\sutables.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\Import.defx">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
     </ItemGroup>
     <ItemGroup>
-        <None Update="TestData\HoekscheWaardCsv\characteristicpoints.csv">
+        <None Update="TestData\CSVData\ImporterTest\aquifers.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>
-    </ItemGroup>
-    <ItemGroup>
         <None Update="TestData\CSVData\ImporterTest\characteristicpoints.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
@@ -330,6 +225,72 @@
         </None>
     </ItemGroup>
     <ItemGroup>
+        <None Update="TestData\CSVData\Full1DProject\csvfiles\sutables.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\characteristicpoints.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\locations.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\modelparameters.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\scenarios.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\segments.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\sigmataucurves.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\soilprofiles.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\soils.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\csvfiles\surfacelines.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTableCsvFile\Import.defx">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\characteristicpoints.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\locations.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\modelparameters.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\scenarios.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\segments.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\sigmataucurves.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\soilprofiles.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\soils.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\surfacelines.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\csvfiles\sutables.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full1DProjectMissingSuTable\Import.defx">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
         <None Update="TestData\CSVData\Full1DProject\csvfiles\characteristicpoints.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
@@ -369,18 +330,9 @@
         <None Update="TestData\CSVData\Full1DProject\csvfiles\sigmataucurves.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="TestData\CSVData\Full2DProject\csvfiles\soils.csv">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-    <ItemGroup>
         <None Update="TestData\CSVData\Full1DProjectInvalidSigmaTauTable\Import.defx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup>
         <None Update="TestData\CSVData\Full1DProjectMissingSigmaTauTable\csvfiles\characteristicpoints.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
@@ -476,6 +428,12 @@
         </None>
     </ItemGroup>
     <ItemGroup>
+        <None Update="TestData\CSVData\Full2DProject\csvfiles\aquifers.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\CSVData\Full2DProject\csvfiles\soils.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
         <None Update="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_005_STBI.sti">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
@@ -706,138 +664,137 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <None Update="TestData\Sensors\csvfiles\characteristicpoints.csv">
+        <None Update="TestData\ShapeFiles\Gemeenten.dbf">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\csvfiles\locations.csv">
+        <None Update="TestData\ShapeFiles\Gemeenten.shp">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\csvfiles\modelparameters.csv">
+        <None Update="TestData\ShapeFiles\Gemeenten.shx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\csvfiles\scenarios.csv">
+        <None Update="TestData\ShapeFiles\Gemeenten.shp.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\csvfiles\segments.csv">
+        <None Update="TestData\ShapeFiles\Gemeenten.fix">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\csvfiles\soilmaterials.mdb">
+        <None Update="TestData\ShapeFiles\Gemeenten.prj">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\csvfiles\surfacelines.csv">
+        <None Update="TestData\ShapeFiles\Gemeenten.qix">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP29_9.sti">
+        <None Update="TestData\ShapeFiles\Gemeenten.sbn">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP30_1.sti">
+        <None Update="TestData\ShapeFiles\Gemeenten.sbx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP30_2.sti">
+    </ItemGroup>
+    <ItemGroup>
+        <None Update="TestData\GrootSallandBinnenwaarts\characteristicpoints.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP31_5.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\locations.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP33_4.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\modelparameters.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP35_5.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\nonwaterretainingobjects.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Geometries\DP37_0.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\scenarios.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Import.defx">
+        <None Update="TestData\GrootSallandBinnenwaarts\segments.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\Sensors\Sensordata.xls">
+        <None Update="TestData\GrootSallandBinnenwaarts\soilprofiles.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="TestData\StiImporter\GeoFile.geo">
+        <None Update="TestData\GrootSallandBinnenwaarts\surfacelines.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\InvalidGeometryVersion.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.dbf">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\InvalidSoilVersion.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.prj">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\SeepFile.SEI">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.sbn">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\SimpleProfile.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.sbx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\SimpleProfileWithException.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.shp">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\Tutorial-1a 10.1.4.3.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.shx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\Tutorial-1a 14.1.2.1.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.shp.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\StiImporter\Tutorial-1a 16.1.2.1.sti">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.dbf">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="TestData\ShapeFiles\Gemeenten.dbf">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.prj">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.shp">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.sbn">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.shx">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.sbx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.shp.xml">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.shp">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.fix">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.shx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.prj">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.shp.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.qix">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.cpg">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.sbn">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.dbf">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\ShapeFiles\Gemeenten.sbx">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.prj">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="TestData\GrootSallandBinnenwaarts\characteristicpoints.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.qpj">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\locations.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.shp">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\modelparameters.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.shx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\nonwaterretainingobjects.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.dbf">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\scenarios.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.sbn">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\segments.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.sbx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\soilprofiles.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.shp">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\surfacelines.csv">
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.shx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
+        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.shp.xml">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
     <ItemGroup>
         <None Update="TestData\Invoer1-STBI-toDesign\csvfiles\characteristicpoints.csv">
@@ -1312,86 +1269,6 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.dbf">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.prj">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.sbn">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.sbx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.shp">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.shx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\PenetrationLength.shp.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.dbf">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.prj">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.sbn">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.sbx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.shp">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.shx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\trafficload.shp.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.cpg">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.dbf">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.prj">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.qpj">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.shp">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\TL_DegreeOfConsolidation.shx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.dbf">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.sbn">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.sbx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.shp">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.shx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestData\GrootSallandBinnenwaarts\Shapes\Crosssection.shp.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-    <ItemGroup>
         <None Update="TestData\HHNKShapeFiles\DampingFactorPL3.dbf">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/soils.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/Import.defx'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/segments.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/modelparameters.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/characteristicpoints.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/scenarios.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/surfacelines.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5967 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/csvfiles/locations.csv'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/Sensors/Sensordata.xls
===================================================================
diff -u -r4047 -r5967
Binary files differ