Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r764 -r766
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 764)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 766)
@@ -89,7 +89,7 @@
             };
 
             var subSoilScenario = new SoilGeometryProbability();
-            subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithTwoSandlayers();
+            subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
 
             var damKernelInput = new DamKernelInput
@@ -151,7 +151,7 @@
             location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
 
             var subSoilScenario = new SoilGeometryProbability();
-            subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithTwoSandlayers();
+            subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
 
             var damKernelInput = new DamKernelInput
@@ -225,7 +225,7 @@
 //            var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
         
             var subSoilScenario = new SoilGeometryProbability();
-            subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithTwoSandlayers();
+            subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
             var input = new DamKernelInput
             {
@@ -306,60 +306,5 @@
 //            kernelWrapper.PostProcess(null, new DamPipingSellmeijerVnkOutput(), "", out result);
         }
         
-
-        public static SoilProfile1D CreatePipingSellmeijerProfileWithTwoSandlayers()
-        {
-            SoilProfile1D soilProfile1D = new SoilProfile1D();
-            SoilLayer1D soilLayer1D1 = new SoilLayer1D();
-            soilLayer1D1.Name = "L0";
-            soilLayer1D1.TopLevel = 10.0;
-            soilLayer1D1.Soil = new Soil("Topmaterial", 1.0, 1.0);
-            soilLayer1D1.Soil.PermeabKx = 0.0003;
-            soilLayer1D1.Soil.DiameterD70 = 0.0003;
-            soilLayer1D1.Soil.WhitesConstant = 0.5;
-            soilLayer1D1.Soil.BeddingAngle = 57.0;
-            soilLayer1D1.Soil.DryUnitWeight = 0.01;
-            soilLayer1D1.IsAquifer = false;
-            soilProfile1D.Layers.Add(soilLayer1D1);
-
-            SoilLayer1D soilLayer1D2 = new SoilLayer1D();
-            soilLayer1D2.Name = "L1";
-            soilLayer1D2.TopLevel = -2.0;
-            soilLayer1D2.Soil = new Soil("Sand upper", 22.0, 20.0);
-            soilLayer1D2.Soil.PermeabKx = 0.0001;
-            soilLayer1D2.Soil.DiameterD70 = 0.0002;
-            soilLayer1D2.Soil.WhitesConstant = 0.25;
-            soilLayer1D2.Soil.BeddingAngle = 37.0;
-            soilLayer1D2.Soil.DryUnitWeight = 0.01;
-            soilLayer1D2.IsAquifer = true;
-            soilProfile1D.Layers.Add(soilLayer1D2);
-
-            SoilLayer1D soilLayer1D3 = new SoilLayer1D();
-            soilLayer1D3.Name = "L2";
-            soilLayer1D3.TopLevel = -3.99;
-            soilLayer1D3.Soil = new Soil("Clay", 22.0, 20.0);
-            soilLayer1D3.Soil.PermeabKx = 0.0001;
-            soilLayer1D3.Soil.DiameterD70 = 0.0002;
-            soilLayer1D3.Soil.WhitesConstant = 0.25;
-            soilLayer1D3.Soil.BeddingAngle = 37.0;
-            soilLayer1D3.Soil.DryUnitWeight = 0.01;
-            soilLayer1D3.IsAquifer = false;
-            soilProfile1D.Layers.Add(soilLayer1D3);
-
-            SoilLayer1D soilLayer1D4 = new SoilLayer1D();
-            soilLayer1D4.Name = "L3";
-            soilLayer1D4.TopLevel = -4.0;
-            soilLayer1D4.Soil = new Soil("Sand lower", 22.0, 20.0);
-            soilLayer1D4.Soil.PermeabKx = 0.0002;
-            soilLayer1D4.Soil.DiameterD70 = 0.0003;
-            soilLayer1D4.Soil.WhitesConstant = 0.35;
-            soilLayer1D4.Soil.BeddingAngle = 47.0;
-            soilLayer1D4.Soil.DryUnitWeight = 0.01;
-            soilLayer1D4.IsAquifer = true;
-            soilProfile1D.Layers.Add(soilLayer1D4);
-            soilProfile1D.BottomLevel = -10.0;
-            return soilProfile1D;
-        }
-
     }
 }
Index: dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs
===================================================================
diff -u -r762 -r766
--- dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs	(.../FactoryForSoilProfiles.cs)	(revision 762)
+++ dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs	(.../FactoryForSoilProfiles.cs)	(revision 766)
@@ -491,59 +491,75 @@
             return soilProfile;
         }
 
-//        /// <summary>
-//        /// Create three layer soil profile with pleistocene and intermediate sand layer
-//        /// </summary>
-//        /// <returns>soil profile</returns>
-//        public static SoilProfile1D CreatePipingSellmeijerProfileWithTwoSandlayers()
-//        {
-//            var soilProfile = new SoilProfile1D();
-//
-//            var layer = new SoilLayer1D()
-//            {
-//                Name = GetNewUniqueLayerName(soilProfile)
-//            };
-//            layer.TopLevel = 10.0;
-//            layer.Soil = new Soil("Topmaterial", 1.0, 1.0, 0.0003, Physics.FactorMicroMeterToMeter*300.0, 0.5, 57.0);
-//            layer.Soil.DryUnitWeight = 0.01;
-//            layer.IsAquifer = false;
-//            soilProfile.Layers.Add(layer);
-//
-//            layer = new SoilLayer1D()
-//            {
-//                Name = GetNewUniqueLayerName(soilProfile)
-//            };
-//            layer.TopLevel = -2.0;
-//            layer.Soil = new Soil("Sand upper", 22.0, 20.0, 0.0001, Physics.FactorMicroMeterToMeter*200.0, 0.25, 37.0);
-//            layer.Soil.DryUnitWeight = 0.01;
-//            layer.IsAquifer = true;
-//            soilProfile.Layers.Add(layer);
-//
-//            layer = new SoilLayer1D()
-//            {
-//                Name = GetNewUniqueLayerName(soilProfile)
-//            };
-//            layer.TopLevel = -3.99;
-//            layer.Soil = new Soil("Clay", 22.0, 20.0, 0.0001, Physics.FactorMicroMeterToMeter*200.0, 0.25, 37.0);
-//            layer.Soil.DryUnitWeight = 0.01;
-//            layer.IsAquifer = false;
-//            soilProfile.Layers.Add(layer);
-//
-//            layer = new SoilLayer1D()
-//            {
-//                Name = GetNewUniqueLayerName(soilProfile)
-//            };
-//            layer.TopLevel = -4.0;
-//            layer.Soil = new Soil("Sand lower", 22.0, 20.0, 0.0002, Physics.FactorMicroMeterToMeter*300.0, 0.35, 47.0);
-//            layer.Soil.DryUnitWeight = 0.01;
-//            layer.IsAquifer = true;
-//            soilProfile.Layers.Add(layer);
-//
-//            soilProfile.BottomLevel = -10.0;
-//
-//            return soilProfile;
-//        }
+        /// <summary>
+        /// Create three layer soil profile with pleistocene and intermediate sand layer
+        /// </summary>
+        /// <returns>soil profile</returns>
+        public static SoilProfile1D CreatePipingSellmeijerProfileWithTwoSandlayers()
+        {
+            var soilProfile = new SoilProfile1D();
 
+            var layer = new SoilLayer1D()
+            {
+                Name = GetNewUniqueLayerId(soilProfile)
+            };
+            layer.TopLevel = 10.0;
+            layer.Soil = new Soil("Topmaterial", 1.0, 1.0);
+            layer.Soil.PermeabKx = 0.0003;
+            layer.Soil.DiameterD70 = 0.0003;
+            layer.Soil.WhitesConstant = 0.5;
+            layer.Soil.BeddingAngle = 57.0;
+            layer.Soil.DryUnitWeight = 0.01;
+            layer.IsAquifer = false;
+            soilProfile.Layers.Add(layer);
+
+            layer = new SoilLayer1D()
+            {
+                Name = GetNewUniqueLayerId(soilProfile)
+            };
+            layer.TopLevel = -2.0;
+            layer.Soil = new Soil("Sand upper", 22.0, 20.0);
+            layer.Soil.PermeabKx = 0.0001;
+            layer.Soil.DiameterD70 = 0.0002;
+            layer.Soil.WhitesConstant = 0.25;
+            layer.Soil.BeddingAngle = 37.0;
+            layer.Soil.DryUnitWeight = 0.01;
+            layer.IsAquifer = true;
+            soilProfile.Layers.Add(layer);
+
+            layer = new SoilLayer1D()
+            {
+                Name = GetNewUniqueLayerId(soilProfile)
+            };
+            layer.TopLevel = -3.99;
+            layer.Soil = new Soil("Clay", 22.0, 20.0);
+            layer.Soil.PermeabKx = 0.0001;
+            layer.Soil.DiameterD70 = 0.0002;
+            layer.Soil.WhitesConstant = 0.25;
+            layer.Soil.BeddingAngle = 37.0;
+            layer.Soil.DryUnitWeight = 0.01;
+            layer.IsAquifer = false;
+            soilProfile.Layers.Add(layer);
+
+            layer = new SoilLayer1D()
+            {
+                Name = GetNewUniqueLayerId(soilProfile)
+            };
+            layer.TopLevel = -4.0;
+            layer.Soil = new Soil("Sand lower", 22.0, 20.0);
+            layer.Soil.PermeabKx = 0.0002;
+            layer.Soil.DiameterD70 = 0.0003;
+            layer.Soil.WhitesConstant = 0.35;
+            layer.Soil.BeddingAngle = 47.0;
+            layer.Soil.DryUnitWeight = 0.01;
+            layer.IsAquifer = true;
+            soilProfile.Layers.Add(layer);
+
+            soilProfile.BottomLevel = -10.0;
+
+            return soilProfile;
+        }
+
         private static string GetNewUniqueLayerName(SoilProfile1D soilProfile)
         {
             throw new System.NotImplementedException();