Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r2892 -r2893
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 2892)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 2893)
@@ -132,10 +132,10 @@
     <None Include="..\Copying.AGPL.licenseheader">
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
-    <None Include="KernelWrappers\TestData\18_4_94.sti">
+    <None Include="KernelWrappers\Common\TestFiles\18_4_94.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="KernelWrappers\TestData\1D1.sti">
+    <None Include="KernelWrappers\Common\TestFiles\1D1.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="KernelWrappers\MacroStabilityCommon\TestFiles\Benchmark 1-01b.wti">
@@ -149,37 +149,37 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="KernelWrappers\TestData\DWP_1.sti">
+    <None Include="KernelWrappers\Common\TestFiles\DWP_1.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="KernelWrappers\TestData\expectedTest.sti">
+    <None Include="KernelWrappers\Common\TestFiles\expectedTest.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="KernelWrappers\TestData\OutwardsZones.sti">
+    <None Include="KernelWrappers\Common\TestFiles\OutwardsZones.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="KernelWrappers\TestData\ProfileOutput.xml">
+    <None Include="KernelWrappers\Common\TestFiles\ProfileOutput.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="KernelWrappers\TestData\SimpleGeometry.sti">
+    <None Include="KernelWrappers\Common\TestFiles\SimpleGeometry.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="KernelWrappers\TestData\soilmaterials.mdb">
+    <None Include="KernelWrappers\Common\TestFiles\soilmaterials.mdb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="KernelWrappers\TestData\soilmaterialsOutwards.mdb">
+    <None Include="KernelWrappers\Common\TestFiles\soilmaterialsOutwards.mdb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="KernelWrappers\TestData\test.xml">
+    <None Include="KernelWrappers\Common\TestFiles\test.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="KernelWrappers\TestData\DAM Tutorial Design0.soilmaterials.mdb">
+    <Content Include="KernelWrappers\Common\TestFiles\DAM Tutorial Design0.soilmaterials.mdb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="KernelWrappers\MacroStabilityCommon\TestFiles\Result1.xml">
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs
===================================================================
diff -u -r2892 -r2893
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs	(.../UpliftHelperTests.cs)	(revision 2892)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs	(.../UpliftHelperTests.cs)	(revision 2893)
@@ -73,7 +73,7 @@
         
         private static DamKernelInput CreateDamKernelInput()
         {
-            const string testFolder = @"KernelWrappers\TestData";
+            const string testFolder = @"KernelWrappers\Common\TestFiles";
 
             var projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder));
             var soilDbName = Path.Combine(projectPath, "soilMaterials.mdb");
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/soilmaterialsOutwards.mdb
===================================================================
diff -u -r2892 -r2893
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/DAM Tutorial Design0.soilmaterials.mdb
===================================================================
diff -u -r2892 -r2893
Binary files differ
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/1D1.sti'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/OutwardsZones.sti'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/expectedTest.sti'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/test.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/soilmaterials.mdb
===================================================================
diff -u -r2892 -r2893
Binary files differ
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/DWP_1.sti'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/SimpleGeometry.sti'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/18_4_94.sti'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2893 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestData/ProfileOutput.xml'.
Fisheye: No comparison available.  Pass `N' to diff?