Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r84e889aa70e2cd0fc1972628144470cf2c223e3d -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 84e889aa70e2cd0fc1972628144470cf2c223e3d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -76,56 +76,6 @@
         }
 
         [Test]
-        public void CreateDesignWaterLevelCalculated_DesignWaterLevel_ExpectedValues()
-        {
-            // Setup
-            const double designWaterLevelValue = 4.5;
-
-            // Call
-            HydraulicBoundaryLocation testLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(designWaterLevelValue);
-
-            // Assert
-            Assert.IsInstanceOf<HydraulicBoundaryLocation>(testLocation);
-            Assert.AreEqual(0, testLocation.Id);
-            Assert.IsEmpty(testLocation.Name);
-            Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-
-            AssertCalculationHasOutput(designWaterLevelValue, testLocation.DesignWaterLevelCalculation1);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation1.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
-        }
-
-        [Test]
-        public void CreateWaveHeightCalculated_WaveHeight_ExpectedValues()
-        {
-            // Setup
-            const double waveHeightValue = 5.5;
-
-            // Call
-            HydraulicBoundaryLocation testLocation = TestHydraulicBoundaryLocation.CreateWaveHeightCalculated(waveHeightValue);
-
-            // Assert
-            Assert.IsInstanceOf<HydraulicBoundaryLocation>(testLocation);
-            Assert.AreEqual(0, testLocation.Id);
-            Assert.IsEmpty(testLocation.Name);
-            Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
-            AssertCalculationHasOutput(waveHeightValue, testLocation.WaveHeightCalculation1);
-            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
-        }
-
-        [Test]
         public void CreateFullyCalculated_DesignWaterLevelAndWaveHeight_ExpectedValues()
         {
             // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs
===================================================================
diff -u -rcfc1ad28f543ae8ee0cb46ebb2767dc15de4493c -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision cfc1ad28f543ae8ee0cb46ebb2767dc15de4493c)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -74,29 +74,5 @@
         {
             return new TestHydraulicBoundaryLocation(4.5, 5.5);
         }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with
-        /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set for
-        /// <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation1"/>.
-        /// </summary>
-        /// <param name="designWaterLevel">The design water level result to set in the output.</param>
-        /// <returns>A new <see cref="TestHydraulicBoundaryLocation"/>.</returns>
-        public static TestHydraulicBoundaryLocation CreateDesignWaterLevelCalculated(double designWaterLevel)
-        {
-            return new TestHydraulicBoundaryLocation(designWaterLevel, null);
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with
-        /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set for
-        /// <see cref="HydraulicBoundaryLocation.WaveHeightCalculation1"/>.
-        /// </summary>
-        /// <param name="waveHeight">The wave height result to set in the output.</param>
-        /// <returns>A new <see cref="TestHydraulicBoundaryLocation"/>.</returns>
-        public static TestHydraulicBoundaryLocation CreateWaveHeightCalculated(double waveHeight)
-        {
-            return new TestHydraulicBoundaryLocation(null, waveHeight);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rab5044d23f83bbc1b8906f23a2a541162c6e6464 -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision ab5044d23f83bbc1b8906f23a2a541162c6e6464)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -1382,7 +1382,13 @@
                 Name = "A",
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(12),
+                    HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+                    {
+                        DesignWaterLevelCalculation1 =
+                        {
+                            Output = new TestHydraulicBoundaryLocationOutput(12)
+                        }
+                    },
                     LowerBoundaryRevetment = (RoundedDouble) 1.0,
                     UpperBoundaryRevetment = (RoundedDouble) 10.0,
                     StepSize = WaveConditionsInputStepSize.One,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r1aee3bed1c335bc1b6e48d1c5ca3df85d1f15633 -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 1aee3bed1c335bc1b6e48d1c5ca3df85d1f15633)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -407,14 +407,15 @@
                                                                                                        stochasticSoilProfile
                                                                                                    });
 
-            HydraulicBoundaryLocation testHydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(0.0);
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             var calculationItem = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
                     UseAssessmentLevelManualInput = useManualAssessmentLevelInput,
-                    HydraulicBoundaryLocation = testHydraulicBoundaryLocation,
+                    AssessmentLevel = random.NextRoundedDouble(),
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     SurfaceLine = surfaceLine,
                     StochasticSoilModel = stochasticSoilModel,
                     StochasticSoilProfile = stochasticSoilProfile
@@ -438,7 +439,7 @@
                                                         ? inputParameters.AssessmentLevel
                                                         : GetTestNormativeAssessmentLevel();
             Assert.AreEqual(expectedAssessmentLevel, properties.AssessmentLevel);
-            Assert.AreSame(testHydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation);
+            Assert.AreSame(hydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation);
             Assert.AreEqual(inputParameters.UseAssessmentLevelManualInput, properties.UseAssessmentLevelManualInput);
 
             Assert.AreSame(surfaceLine, properties.SurfaceLine);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -rc3bad8213c1debff4131283d231797544ed28294 -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision c3bad8213c1debff4131283d231797544ed28294)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -530,14 +530,15 @@
                 stochasticSoilProfile
             });
 
-            HydraulicBoundaryLocation testHydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(0.0);
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             var calculationItem = new PipingCalculationScenario(new GeneralPipingInput())
             {
                 InputParameters =
                 {
                     UseAssessmentLevelManualInput = useManualAssessmentLevelInput,
-                    HydraulicBoundaryLocation = testHydraulicBoundaryLocation,
+                    AssessmentLevel = random.NextRoundedDouble(),
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     SurfaceLine = surfaceLine,
                     StochasticSoilModel = stochasticSoilModel,
                     StochasticSoilProfile = stochasticSoilProfile
@@ -607,7 +608,7 @@
             Assert.AreSame(stochasticSoilProfile, properties.StochasticSoilProfile);
             Assert.AreSame(stochasticSoilModel, properties.StochasticSoilModel);
 
-            Assert.AreSame(testHydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation);
+            Assert.AreSame(hydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation);
             Assert.AreEqual(expectedAssessmentLevel, properties.AssessmentLevel);
             Assert.AreEqual(inputParameters.UseAssessmentLevelManualInput, properties.UseAssessmentLevelManualInput);
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0675953261cf69c17e4cb8e533037f8800ef12a5 -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 0675953261cf69c17e4cb8e533037f8800ef12a5)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -1581,7 +1581,7 @@
                 Name = "A",
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(12),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
                     LowerBoundaryRevetment = (RoundedDouble) 1.0,
                     UpperBoundaryRevetment = (RoundedDouble) 10.0,
                     StepSize = WaveConditionsInputStepSize.One,
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r39bfe92f1de39815735777395a301b0b73c4ce5f -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 39bfe92f1de39815735777395a301b0b73c4ce5f)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
@@ -1309,7 +1309,7 @@
                 Name = "A",
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(12),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
                     LowerBoundaryRevetment = (RoundedDouble) 1.0,
                     UpperBoundaryRevetment = (RoundedDouble) 10.0,
                     StepSize = WaveConditionsInputStepSize.One,