Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c -rf00ef179f4b76ecd6fcfe67b1e6ea797e8525509
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision f00ef179f4b76ecd6fcfe67b1e6ea797e8525509)
@@ -75,7 +75,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, GetTestNormativeAssessmentLevel, handler);
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, GetTestNormativeAssessmentLevel(), handler);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -84,34 +84,6 @@
         }
 
         [Test]
-        public void Constructor_GetAssessmentLevelFuncNull_ThrowArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var handler = mocks.Stub<IObservablePropertyChangeHandler>();
-            mocks.ReplayAll();
-
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-
-            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
-                                                                calculationItem,
-                                                                Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
-                                                                Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
-                                                                failureMechanism,
-                                                                assessmentSection);
-
-            // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, null, handler);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("getNormativeAssessmentLevelFunc", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Constructor_PropertyChangeHandlerNull_ThrowArgumentNullException()
         {
             // Setup
@@ -130,7 +102,7 @@
                                                                 assessmentSection);
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, null);
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -157,7 +129,7 @@
                                                                 assessmentSection);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsInputContext>>(properties);
@@ -187,7 +159,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler)
             {
                 UseAssessmentLevelManualInput = false
             };
@@ -330,7 +302,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler)
             {
                 UseAssessmentLevelManualInput = useManualAssessmentLevelInput
             };
@@ -428,7 +400,7 @@
                                                                 assessmentSection);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Assert
             RoundedDouble expectedAssessmentLevel = useManualAssessmentLevelInput
@@ -477,7 +449,7 @@
                                                                 assessmentSection);
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             var random = new Random(21);
             const double assessmentLevel = 0.36;
@@ -652,7 +624,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D();
             inputParameters.StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -706,7 +678,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             properties.SurfaceLine = testSurfaceLine;
@@ -760,7 +732,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             properties.SurfaceLine = newSurfaceLine;
@@ -825,7 +797,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             properties.StochasticSoilModel = stochasticSoilModel2;
@@ -849,7 +821,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             IEnumerable<MacroStabilityInwardsSurfaceLine> surfaceLines = properties.GetAvailableSurfaceLines();
@@ -873,7 +845,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Precondition:
             Assert.IsNull(calculation.InputParameters.SurfaceLine);
@@ -943,7 +915,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Precondition:
             Assert.IsNotNull(calculation.InputParameters.SurfaceLine);
@@ -974,7 +946,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Precondition
             Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
@@ -1013,7 +985,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Precondition
             Assert.IsNotNull(calculation.InputParameters.StochasticSoilModel);
@@ -1040,7 +1012,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null;
 
@@ -1090,7 +1062,7 @@
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
@@ -1132,7 +1104,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1184,7 +1156,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1249,7 +1221,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             IEnumerable<SelectableHydraulicBoundaryLocation> originalList = properties.GetSelectableHydraulicBoundaryLocations()
                                                                                       .ToList();
@@ -1299,7 +1271,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("AssessmentLevel");
@@ -1326,7 +1298,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("prop");
@@ -1362,7 +1334,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("SelectedHydraulicBoundaryLocation");
@@ -1389,7 +1361,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("prop");
@@ -1425,7 +1397,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Call
             setProperty(properties);