Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs
===================================================================
diff -u -re82f04fb50a7b5a6f9c45289258c00c94aa8c64c -r8142644ec1337be8032e9214b1f103c85d9037f7
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision e82f04fb50a7b5a6f9c45289258c00c94aa8c64c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision 8142644ec1337be8032e9214b1f103c85d9037f7)
@@ -25,7 +25,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.KernelWrapper.SubCalculator;
 using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator;
@@ -61,59 +60,6 @@
         }
 
         [Test]
-        public void AssessmentLevel_InputHasNewHydraulicBoundaryLocationSet_AssessmentLevelUpdated()
-        {
-            // Setup
-            var input = new PipingInput(new GeneralPipingInput());
-            var derivedInput = new DerivedPipingInput(input);
-
-            RoundedDouble testLevel = (RoundedDouble) new Random(21).NextDouble();
-
-            input.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0)
-            {
-                DesignWaterLevel = testLevel
-            };
-
-            // Call
-            var calculatedAssessmentLevel = derivedInput.AssessmentLevel;
-
-            // Assert
-            Assert.AreEqual(testLevel, calculatedAssessmentLevel, derivedInput.AssessmentLevel.GetAccuracy());
-        }
-
-        [Test]
-        public void AssessmentLevel_InputWithoutHydraulicBoundaryLocationSet_AssessmentLevelSetToNaN()
-        {
-            // Setup
-            var input = new PipingInput(new GeneralPipingInput());
-            var derivedInput = new DerivedPipingInput(input);
-
-            input.HydraulicBoundaryLocation = null;
-
-            // Call
-            var calculatedAssessmentLevel = derivedInput.AssessmentLevel;
-
-            // Assert
-            Assert.IsNaN(calculatedAssessmentLevel);
-        }
-
-        [Test]
-        public void AssessmentLevel_HydraulicBoundaryCalculationUncalculated_AssessmentLevelNaN()
-        {
-            // Setup
-            var input = new PipingInput(new GeneralPipingInput());
-            var derivedInput = new DerivedPipingInput(input);
-
-            input.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0);
-
-            // Call
-            var calculatedAssessmentLevel = derivedInput.AssessmentLevel;
-
-            // Assert
-            Assert.IsNaN(calculatedAssessmentLevel);
-        }
-
-        [Test]
         public void PiezometricHeadExit_ValidInput_SetsParametersForCalculatorAndReturnsPiezometricHead()
         {
             // Setup
@@ -132,7 +78,7 @@
                 var factory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance;
                 var piezometricHeadAtExitCalculator = factory.LastCreatedPiezometricHeadAtExitCalculator;
 
-                Assert.AreEqual(piezometricHeadAtExitCalculator.HRiver, derivedInput.AssessmentLevel, derivedInput.AssessmentLevel.GetAccuracy());
+                Assert.AreEqual(piezometricHeadAtExitCalculator.HRiver, input.AssessmentLevel, input.AssessmentLevel.GetAccuracy());
                 Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder,
                                 input.PhreaticLevelExit.GetAccuracy());
                 Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit,