Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -r83bbbf7a7a1ad50b337b2641840e045bc4f1193d -r61c7519f57aa638c6fd6dee33c4136860de98ebd
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 83bbbf7a7a1ad50b337b2641840e045bc4f1193d)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 61c7519f57aa638c6fd6dee33c4136860de98ebd)
@@ -80,14 +80,17 @@
         {
             // Setup
             var random = new Random(21);
+            var soilModel = new List<Soil>();
             var soilProfile2D = new SoilProfile2D();
+            var waternetDaily = new WtiStabilityWaternet();
+            var waternetExtreme = new WtiStabilityWaternet();
+            bool moveGrid = random.NextBoolean();
             double maximumSliceWidth = random.NextDouble();
             var slipPlaneUpliftVan = new SlipPlaneUpliftVan();
-            bool moveGrid = random.NextBoolean();
-            bool gridAutomaticDetermined = random.NextBoolean();
+            var surfaceLine = new SurfaceLine2();
             var slipPlaneConstraints = new SlipPlaneConstraints();
-            var waternetDaily = new WtiStabilityWaternet();
-            var waternetExtreme = new WtiStabilityWaternet();
+            bool gridAutomaticDetermined = random.NextBoolean();
+            bool tangentLinesAutomaticDetermined = random.NextBoolean();
             var fixedSoilStresses = new[]
             {
                 new FixedSoilStress()
@@ -99,11 +102,14 @@
 
             // Call
             var kernel = new UpliftVanKernelWrapper();
+            kernel.SetSoilModel(soilModel);
             kernel.SetSoilProfile(soilProfile2D);
             kernel.SetMaximumSliceWidth(maximumSliceWidth);
             kernel.SetSlipPlaneUpliftVan(slipPlaneUpliftVan);
+            kernel.SetSurfaceLine(surfaceLine);
             kernel.SetMoveGrid(moveGrid);
             kernel.SetGridAutomaticDetermined(gridAutomaticDetermined);
+            kernel.SetTangentLinesAutomaticDetermined(tangentLinesAutomaticDetermined);
             kernel.SetSlipPlaneConstraints(slipPlaneConstraints);
             kernel.SetWaternetDaily(waternetDaily);
             kernel.SetWaternetExtreme(waternetExtreme);
@@ -114,24 +120,24 @@
             var kernelModel = TypeUtils.GetField<KernelModel>(kernel, "kernelModel");
             StabilityModel stabilityModel = kernelModel.StabilityModel;
 
-            Assert.IsNotNull(stabilityModel.SlipPlaneConstraints);
-            Assert.AreEqual(GridOrientation.Inwards, stabilityModel.GridOrientation);
-            Assert.IsNotNull(stabilityModel.SlipCircle);
-            Assert.AreEqual(SearchAlgorithm.Grid, stabilityModel.SearchAlgorithm);
-            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.ModelOption);
+            CollectionAssert.AreEqual(soilModel, kernelModel.StabilityModel.Soils);
+            Assert.AreSame(waternetDaily, stabilityModel.ConstructionStages.First().GeotechnicsData.CurrentWaternet);
+            Assert.AreSame(waternetExtreme, stabilityModel.ConstructionStages.Last().GeotechnicsData.CurrentWaternet);
+            Assert.AreEqual(moveGrid, stabilityModel.MoveGrid);
             Assert.AreEqual(maximumSliceWidth, stabilityModel.MaximumSliceWidth);
             Assert.AreSame(slipPlaneUpliftVan, stabilityModel.SlipPlaneUpliftVan);
+            Assert.AreSame(surfaceLine, kernelModel.PreprocessingModel.LastStage.SurfaceLine);
             Assert.AreSame(slipPlaneConstraints, stabilityModel.SlipPlaneConstraints);
-            Assert.AreEqual(moveGrid, stabilityModel.MoveGrid);
             Assert.AreEqual(gridAutomaticDetermined, kernelModel.PreprocessingModel.SearchAreaConditions.AutoSearchArea);
-
+            Assert.AreEqual(tangentLinesAutomaticDetermined, kernelModel.PreprocessingModel.SearchAreaConditions.AutoTangentLines);
+            Assert.AreEqual(GridOrientation.Inwards, stabilityModel.GridOrientation);
+            Assert.IsNotNull(stabilityModel.SlipCircle);
+            Assert.AreEqual(SearchAlgorithm.Grid, stabilityModel.SearchAlgorithm);
+            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.ModelOption);
             Assert.AreEqual(2, stabilityModel.ConstructionStages.Count);
+            
+            AssertConstructionStages(stabilityModel.ConstructionStages, soilProfile2D, fixedSoilStresses, preConsolidationStresses);
 
-            Assert.AreSame(waternetDaily, stabilityModel.ConstructionStages.First().GeotechnicsData.CurrentWaternet);
-            Assert.AreSame(waternetExtreme, stabilityModel.ConstructionStages.Last().GeotechnicsData.CurrentWaternet);
-
-            AssertConstructionStages(stabilityModel.ConstructionStages, fixedSoilStresses, preConsolidationStresses);
-
             Assert.AreEqual(2, kernelModel.PreprocessingModel.PreProcessingConstructionStages.Count);
             kernelModel.PreprocessingModel.PreProcessingConstructionStages.ForEachElementDo(
                 ppcs => Assert.AreSame(stabilityModel, ppcs.StabilityModel));
@@ -250,10 +256,11 @@
             Assert.AreEqual(11, validationMessages.Count());
         }
 
-        private static void AssertConstructionStages(IList<ConstructionStage> constructionStages, FixedSoilStress[] fixedSoilStresses, PreConsolidationStress[] preConsolidationStresses)
+        private static void AssertConstructionStages(IList<ConstructionStage> constructionStages,SoilProfile2D soilProfile2D,  FixedSoilStress[] fixedSoilStresses, PreConsolidationStress[] preConsolidationStresses)
         {
             foreach (ConstructionStage constructionStage in constructionStages)
             {
+                Assert.AreSame(soilProfile2D, constructionStage.SoilProfile);
                 Assert.AreEqual(1, constructionStage.MultiplicationFactorsCPhiForUpliftList.Count);
                 Assert.AreEqual(1.2, constructionStage.MultiplicationFactorsCPhiForUpliftList[0].UpliftFactor);
                 Assert.AreEqual(0.0, constructionStage.MultiplicationFactorsCPhiForUpliftList[0].MultiplicationFactor);