Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs
===================================================================
diff -u -r6086 -r6148
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs	(.../DamEngineDataTestFactory.cs)	(revision 6086)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs	(.../DamEngineDataTestFactory.cs)	(revision 6148)
@@ -56,143 +56,54 @@
     /// Creates the soil list for the tests.
     /// </summary>
     /// <returns></returns>
-    public static SoilList CreateSoilList()
+    private static SoilList CreateSoilList()
     {
         var soilList = new SoilList();
-        var s1 = new Soil("DKN5")
+        var s1 = new Soil("OA")
         {
-            AbovePhreaticLevel = 17.5,
-            BelowPhreaticLevel = 17.50,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s1);
-        var s2 = new Soil("DKN4")
-        {
-            AbovePhreaticLevel = 17.16,
-            BelowPhreaticLevel = 17.16,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s2);
-        var s3 = new Soil("OA")
-        {
             AbovePhreaticLevel = 18.00,
             BelowPhreaticLevel = 20.00,
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 30,
-            Cohesion = 0
+            Cohesion = 0,
+            DilatancyType = DilatancyType.Zero
         };
-        soilList.Soils.Add(s3);
-        var s4 = new Soil("DKN3");
-        s4.ShearStrengthModel = ShearStrengthModel.CPhi;
-        soilList.Soils.Add(s4);
-        var s5 = new Soil("LM")
+        soilList.Soils.Add(s1);
+        var s2 = new Soil("LM")
         {
             AbovePhreaticLevel = 17.00,
             BelowPhreaticLevel = 17.50,
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 10,
-            Cohesion = 5
+            Cohesion = 5,
+            DilatancyType = DilatancyType.Zero
         };
-        soilList.Soils.Add(s5);
-
-        var s6 = new Soil("OB1")
+        soilList.Soils.Add(s2);
+        var s3 = new Soil("OB1")
         {
             AbovePhreaticLevel = 18.10,
             BelowPhreaticLevel = 20.10,
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 31,
-            Cohesion = 0
+            Cohesion = 0,
+            DilatancyType = DilatancyType.Zero
         };
-        soilList.Soils.Add(s6);
-
-        var s7 = new Soil("OB2")
+        soilList.Soils.Add(s3);
+        var s4 = new Soil("OB2")
         {
             AbovePhreaticLevel = 17.50,
             BelowPhreaticLevel = 19.50,
             ShearStrengthModel = ShearStrengthModel.CPhi,
             FrictionAngle = 34,
-            Cohesion = 0
+            Cohesion = 0,
+            DilatancyType = DilatancyType.Zero
         };
-        soilList.Soils.Add(s7);
-
-        var s8 = new Soil("veen")
-        {
-            AbovePhreaticLevel = 10.15,
-            BelowPhreaticLevel = 10.20,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s8);
-
-        var s9 = new Soil("Del_Tfg")
-        {
-            AbovePhreaticLevel = 10.15,
-            BelowPhreaticLevel = 10.20,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s9);
-
-        var s10 = new Soil("Del_Tss_1")
-        {
-            AbovePhreaticLevel = 14.46,
-            BelowPhreaticLevel = 14.50,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s10);
-
-        var s11 = new Soil("Del_Ffg")
-        {
-            AbovePhreaticLevel = 12.65,
-            BelowPhreaticLevel = 12.70,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s11);
-
-        var s12 = new Soil("Del_Kms")
-        {
-            AbovePhreaticLevel = 18,
-            BelowPhreaticLevel = 20,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s12);
-
-        var s13 = new Soil("Del_Ssc")
-        {
-            AbovePhreaticLevel = 18,
-            BelowPhreaticLevel = 20,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s13);
-
-        var s14 = new Soil("DeL_Tcs")
-        {
-            AbovePhreaticLevel = 16.05,
-            BelowPhreaticLevel = 17.74,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s14);
-
-        var s15 = new Soil("Del_Ppp")
-        {
-            AbovePhreaticLevel = 18,
-            BelowPhreaticLevel = 20,
-            ShearStrengthModel = ShearStrengthModel.CPhi
-        };
-        soilList.Soils.Add(s15);
-        soilList.AquiferDictionary.Add(s1.Name, false);
+        soilList.Soils.Add(s4);
+        
+        soilList.AquiferDictionary.Add(s1.Name, true);
         soilList.AquiferDictionary.Add(s2.Name, false);
-        soilList.AquiferDictionary.Add(s3.Name, true);
+        soilList.AquiferDictionary.Add(s3.Name, false);
         soilList.AquiferDictionary.Add(s4.Name, false);
-        soilList.AquiferDictionary.Add(s5.Name, true);
-        soilList.AquiferDictionary.Add(s6.Name, false);
-        soilList.AquiferDictionary.Add(s7.Name, false);
-        soilList.AquiferDictionary.Add(s8.Name, false);
-        soilList.AquiferDictionary.Add(s9.Name, false);
-        soilList.AquiferDictionary.Add(s10.Name, false);
-        soilList.AquiferDictionary.Add(s11.Name, false);
-        soilList.AquiferDictionary.Add(s12.Name, false);
-        soilList.AquiferDictionary.Add(s13.Name, true);
-        soilList.AquiferDictionary.Add(s14.Name, false);
-        soilList.AquiferDictionary.Add(s15.Name, false);
         return soilList;
     }