Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs
===================================================================
diff -u -rc4392a12110e2bb3549c5fee1ec319c229b67198 -r32125960d547005d1921cec69ec05aab83e0cd40
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressesPropertiesTest.cs)	(revision c4392a12110e2bb3549c5fee1ec319c229b67198)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressesPropertiesTest.cs)	(revision 32125960d547005d1921cec69ec05aab83e0cd40)
@@ -59,13 +59,13 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
+            var propertyChangeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
+            var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, propertyChangeHandler);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsInput>>(properties);
@@ -88,11 +88,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
+            var propertyChangeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(null, changeHandler);
+            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(null, GetTestNormativeAssessmentLevel, propertyChangeHandler);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -101,31 +101,49 @@
         }
 
         [Test]
-        public void Constructor_HandlerNull_ThrowsArgumentNullException()
+        public void Constructor_GetNormativeAssessmentLevelFuncNull_ThrowsArgumentNullException()
         {
             // Setup
+            var mocks = new MockRepository();
+            var propertyChangeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
+            mocks.ReplayAll();
+
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(input, null);
+            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(input, null, propertyChangeHandler);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("handler", exception.ParamName);
+            Assert.AreEqual("getNormativeAssessmentLevelFunc", exception.ParamName);
         }
 
         [Test]
+        public void Constructor_PropertyChangeHandlerNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("propertyChangeHandler", exception.ParamName);
+        }
+
+        [Test]
         public void Constructor_ValidData_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
             var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
+            var propertyChangeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
+            var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, propertyChangeHandler);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -244,13 +262,13 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
+            var propertyChangeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
+            var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, propertyChangeHandler);
 
             // Assert
             Assert.AreEqual(input.WaterLevelRiverAverage, properties.WaterLevelRiverAverage);
@@ -278,7 +296,7 @@
             MacroStabilityInwardsInput input = calculationItem.InputParameters;
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, input);
-            var properties = new MacroStabilityInwardsWaterStressesProperties(input, handler);
+            var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, handler);
 
             var random = new Random(21);
             double waterLevelRiverAverage = random.NextDouble();
@@ -431,11 +449,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
+            var propertyChangeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
-            var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
+            var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, propertyChangeHandler);
 
             // Call
             string toString = properties.ToString();
@@ -444,6 +462,11 @@
             Assert.AreEqual(string.Empty, toString);
         }
 
+        private static RoundedDouble GetTestNormativeAssessmentLevel()
+        {
+            return (RoundedDouble) 1.1;
+        }
+
         private static void SetPropertyAndVerifyNotificationsForCalculation(Action<MacroStabilityInwardsWaterStressesProperties> setProperty,
                                                                             MacroStabilityInwardsCalculation calculation)
         {
@@ -460,7 +483,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsWaterStressesProperties(input, handler);
+            var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             setProperty(properties);