Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r25c94cb9fb71365a0bf91e4e755736dfcb8cfae1 -r3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 25c94cb9fb71365a0bf91e4e755736dfcb8cfae1)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c)
@@ -75,7 +75,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, GetCalculatedTestAssessmentLevel, handler);
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -130,7 +130,7 @@
                                                                 assessmentSection);
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, null);
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -157,7 +157,7 @@
                                                                 assessmentSection);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsInputContext>>(properties);
@@ -187,7 +187,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler)
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 UseAssessmentLevelManualInput = false
             };
@@ -330,7 +330,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler)
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 UseAssessmentLevelManualInput = useManualAssessmentLevelInput
             };
@@ -428,12 +428,12 @@
                                                                 assessmentSection);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             RoundedDouble expectedAssessmentLevel = useManualAssessmentLevelInput
                                                         ? inputParameters.AssessmentLevel
-                                                        : GetCalculatedTestAssessmentLevel();
+                                                        : GetTestNormativeAssessmentLevel();
             Assert.AreEqual(expectedAssessmentLevel, properties.AssessmentLevel);
             Assert.AreSame(testHydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation);
             Assert.AreEqual(inputParameters.UseAssessmentLevelManualInput, properties.UseAssessmentLevelManualInput);
@@ -477,7 +477,7 @@
                                                                 assessmentSection);
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             var random = new Random(21);
             const double assessmentLevel = 0.36;
@@ -652,7 +652,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D();
             inputParameters.StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -706,7 +706,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.SurfaceLine = testSurfaceLine;
@@ -760,7 +760,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.SurfaceLine = newSurfaceLine;
@@ -825,7 +825,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.StochasticSoilModel = stochasticSoilModel2;
@@ -849,7 +849,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<MacroStabilityInwardsSurfaceLine> surfaceLines = properties.GetAvailableSurfaceLines();
@@ -873,7 +873,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition:
             Assert.IsNull(calculation.InputParameters.SurfaceLine);
@@ -943,7 +943,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition:
             Assert.IsNotNull(calculation.InputParameters.SurfaceLine);
@@ -974,7 +974,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition
             Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
@@ -1013,7 +1013,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition
             Assert.IsNotNull(calculation.InputParameters.StochasticSoilModel);
@@ -1040,7 +1040,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null;
 
@@ -1090,7 +1090,7 @@
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
@@ -1132,7 +1132,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1184,7 +1184,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1249,7 +1249,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             IEnumerable<SelectableHydraulicBoundaryLocation> originalList = properties.GetSelectableHydraulicBoundaryLocations()
                                                                                       .ToList();
@@ -1299,7 +1299,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("AssessmentLevel");
@@ -1326,7 +1326,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("prop");
@@ -1362,7 +1362,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("SelectedHydraulicBoundaryLocation");
@@ -1389,7 +1389,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("prop");
@@ -1425,7 +1425,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             setProperty(properties);
@@ -1435,7 +1435,7 @@
             mocks.VerifyAll();
         }
 
-        private static RoundedDouble GetCalculatedTestAssessmentLevel()
+        private static RoundedDouble GetTestNormativeAssessmentLevel()
         {
             return (RoundedDouble) 1.1;
         }