Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs
===================================================================
diff -u -r6a1df79cc36617a42d0016f9b7a9271020a2196e -r8ee58ea1c29f6acefb71efe72d55073709425c88
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs	(.../AddNewDemoDikeAssessmentSectionCommand.cs)	(revision 6a1df79cc36617a42d0016f9b7a9271020a2196e)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs	(.../AddNewDemoDikeAssessmentSectionCommand.cs)	(revision 8ee58ea1c29f6acefb71efe72d55073709425c88)
@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Controls.Commands;
@@ -9,7 +10,6 @@
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin.FileImporters;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.Extensions;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Plugin.FileImporter;
 
@@ -115,13 +115,34 @@
             }
 
             var calculation = pipingFailureMechanism.CalculationsGroup.GetPipingCalculations().First();
-            calculation.InputParameters.SetSurfaceLine(pipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001"));
-            calculation.InputParameters.SetSoilProfile(pipingFailureMechanism.SoilProfiles.First(sl => sl.Name == "W1-6_0_1D1"));
+            calculation.InputParameters.SurfaceLine = pipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001");
+            calculation.InputParameters.SoilProfile = pipingFailureMechanism.SoilProfiles.First(sp => sp.Name == "W1-6_0_1D1");
+            calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
+
+            SetHydraulicBoundaryLocationValues(demoAssessmentSection.HydraulicBoundaryDatabase.Locations);
             calculation.InputParameters.PhreaticLevelExit.Mean = (RoundedDouble) 3;
-            calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0)
-            {
-                DesignWaterLevel = 0.0
-            };
+            calculation.InputParameters.NotifyObservers();
         }
+
+        private void SetHydraulicBoundaryLocationValues(ICollection<HydraulicBoundaryLocation> locations)
+        {
+            locations.ElementAt(0).DesignWaterLevel = 5.78;
+            locations.ElementAt(1).DesignWaterLevel = 5.77;
+            locations.ElementAt(2).DesignWaterLevel = 5.77;
+            locations.ElementAt(3).DesignWaterLevel = 5.77;
+            locations.ElementAt(4).DesignWaterLevel = 5.77;
+            locations.ElementAt(5).DesignWaterLevel = 5.93;
+            locations.ElementAt(6).DesignWaterLevel = 5.93;
+            locations.ElementAt(7).DesignWaterLevel = 5.93;
+            locations.ElementAt(8).DesignWaterLevel = 5.93;
+            locations.ElementAt(9).DesignWaterLevel = 5.93;
+            locations.ElementAt(10).DesignWaterLevel = 5.93;
+            locations.ElementAt(11).DesignWaterLevel = 5.93;
+            locations.ElementAt(12).DesignWaterLevel = 5.93;
+            locations.ElementAt(13).DesignWaterLevel = 5.93;
+            locations.ElementAt(14).DesignWaterLevel = 5.93;
+            locations.ElementAt(15).DesignWaterLevel = 5.54;
+            locations.ElementAt(16).DesignWaterLevel = 5.86;
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -r6a1df79cc36617a42d0016f9b7a9271020a2196e -r8ee58ea1c29f6acefb71efe72d55073709425c88
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 6a1df79cc36617a42d0016f9b7a9271020a2196e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 8ee58ea1c29f6acefb71efe72d55073709425c88)
@@ -51,7 +51,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Extensions\PipingInputExtensions.cs" />
     <Compile Include="PresentationObjects\EmptyPipingCalculationReport.cs" />
     <Compile Include="PresentationObjects\EmptyPipingOutput.cs" />
     <Compile Include="PresentationObjects\PipingCalculationContext.cs" />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r6a1df79cc36617a42d0016f9b7a9271020a2196e -r8ee58ea1c29f6acefb71efe72d55073709425c88
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 6a1df79cc36617a42d0016f9b7a9271020a2196e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 8ee58ea1c29f6acefb71efe72d55073709425c88)
@@ -59,7 +59,6 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Extensions\PipingInputExtensionsTest.cs" />
     <Compile Include="PresentationObjects\PipingFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\RingtoetsPipingSurfaceLineContextTest.cs" />
     <Compile Include="PropertyClasses\GeneralPipingInputPropertiesTest.cs" />