Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -r25c94cb9fb71365a0bf91e4e755736dfcb8cfae1 -r3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 25c94cb9fb71365a0bf91e4e755736dfcb8cfae1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c)
@@ -80,7 +80,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new PipingInputContextProperties(null, GetCalculatedTestAssessmentLevel, handler);
+            TestDelegate test = () => new PipingInputContextProperties(null, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -135,7 +135,7 @@
                                                  assessmentSection);
 
             // Call
-            TestDelegate test = () => new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, null);
+            TestDelegate test = () => new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -162,7 +162,7 @@
                                                  assessmentSection);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<PipingInputContext>>(properties);
@@ -229,7 +229,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler)
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 UseAssessmentLevelManualInput = false
             };
@@ -410,7 +410,7 @@
                                                  assessmentSection);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -459,7 +459,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler)
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 UseAssessmentLevelManualInput = useManualAssessmentLevelInput
             };
@@ -556,7 +556,7 @@
                                                  assessmentSection);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             Assert.AreEqual(inputParameters.PhreaticLevelExit.Mean, properties.PhreaticLevelExit.Mean);
@@ -594,7 +594,7 @@
 
             RoundedDouble expectedAssessmentLevel = useManualAssessmentLevelInput
                                                         ? inputParameters.AssessmentLevel
-                                                        : GetCalculatedTestAssessmentLevel();
+                                                        : GetTestNormativeAssessmentLevel();
 
             Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(inputParameters, expectedAssessmentLevel), properties.PiezometricHeadExit);
 
@@ -635,7 +635,7 @@
                                                  assessmentSection);
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             const double assessmentLevel = 0.36;
             const double entryPointL = 0.12;
@@ -849,7 +849,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler)
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 ExitPointL = (RoundedDouble) exitPoint,
                 EntryPointL = (RoundedDouble) entryPoint
@@ -891,7 +891,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler)
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 EntryPointL = (RoundedDouble) 0.5,
                 ExitPointL = (RoundedDouble) 2
@@ -939,7 +939,7 @@
                 observable
             });
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             TestDelegate call = () => properties.ExitPointL = newExitPointL;
@@ -986,7 +986,7 @@
                 observable
             });
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             TestDelegate call = () => properties.EntryPointL = entryPoint;
@@ -1033,7 +1033,7 @@
                 observable
             });
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             TestDelegate call = () => properties.EntryPointL = entryPointL;
@@ -1078,7 +1078,7 @@
                 observable
             });
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             TestDelegate call = () => properties.ExitPointL = exitPointL;
@@ -1119,7 +1119,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             inputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
 
@@ -1171,7 +1171,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.SurfaceLine = testSurfaceLine;
@@ -1222,7 +1222,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.SurfaceLine = newSurfaceLine;
@@ -1247,7 +1247,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<PipingSurfaceLine> surfaceLines = properties.GetAvailableSurfaceLines();
@@ -1271,7 +1271,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition:
             Assert.IsNull(calculation.InputParameters.SurfaceLine);
@@ -1338,7 +1338,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition:
             Assert.IsNotNull(calculation.InputParameters.SurfaceLine);
@@ -1369,7 +1369,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition
             Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
@@ -1407,7 +1407,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition
             Assert.IsNotNull(calculation.InputParameters.StochasticSoilModel);
@@ -1434,7 +1434,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null;
 
@@ -1484,7 +1484,7 @@
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
@@ -1526,7 +1526,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1578,7 +1578,7 @@
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                  failureMechanism, assessmentSection);
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1643,7 +1643,7 @@
                 observable
             });
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             IEnumerable<SelectableHydraulicBoundaryLocation> originalList = properties.GetSelectableHydraulicBoundaryLocations()
                                                                                       .ToList();
@@ -1693,7 +1693,7 @@
                                                  Enumerable.Empty<PipingStochasticSoilModel>(),
                                                  failureMechanism, assessmentSection);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("AssessmentLevel");
@@ -1720,7 +1720,7 @@
                                                  Enumerable.Empty<PipingStochasticSoilModel>(),
                                                  failureMechanism, assessmentSection);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("prop");
@@ -1756,7 +1756,7 @@
                                                  Enumerable.Empty<PipingStochasticSoilModel>(),
                                                  failureMechanism, assessmentSection);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("SelectedHydraulicBoundaryLocation");
@@ -1783,7 +1783,7 @@
                                                  Enumerable.Empty<PipingStochasticSoilModel>(),
                                                  failureMechanism, assessmentSection);
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("prop");
@@ -1819,7 +1819,7 @@
                 observable
             });
 
-            var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new PipingInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             setProperty(properties);
@@ -1829,7 +1829,7 @@
             mocks.VerifyAll();
         }
 
-        private static RoundedDouble GetCalculatedTestAssessmentLevel()
+        private static RoundedDouble GetTestNormativeAssessmentLevel()
         {
             return (RoundedDouble) 1.1;
         }