Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs
===================================================================
diff -u -r8047e7fd59525ed424105aaefc4ee88b9ae8def6 -r7ddd944b70d252ae493bba48ea9b31c01634082d
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision 8047e7fd59525ed424105aaefc4ee88b9ae8def6)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision 7ddd944b70d252ae493bba48ea9b31c01634082d)
@@ -23,6 +23,7 @@
 using Core.Common.Base;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Probability;
 
 namespace Ringtoets.HeightStructures.Data.Test
 {
@@ -32,28 +33,47 @@
         [Test]
         public void Constructor_NullGeneralInput_ThrowsArgumentNullException()
         {
-            // Setup & Call
-            TestDelegate test = () => new HeightStructuresCalculation(null);
+            // Setup
+            var normProbabilityInput = new NormProbabilityInput();
 
+            // Call
+            TestDelegate test = () => new HeightStructuresCalculation(null, normProbabilityInput);
+
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("generalInputParameters", exception.ParamName);
         }
 
         [Test]
+        public void Constructor_NullNormProbabilityInput_ThrowsArgumentNullException()
+        {
+            // Setup
+            var generalInput = new GeneralHeightStructuresInput();
+
+            // Call
+            TestDelegate test = () => new HeightStructuresCalculation(generalInput, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("normProbabilityInput", exception.ParamName);
+        }
+
+        [Test]
         public void Constructor_DefaultPropertyValuesAreSet()
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
+            var normProbabilityInput = new NormProbabilityInput();
 
             // Call
-            var calculation = new HeightStructuresCalculation(generalInput);
+            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput);
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
+            Assert.AreEqual(normProbabilityInput, calculation.NormProbabilityInput);
             Assert.IsNull(calculation.Comments);
             Assert.IsFalse(calculation.HasOutput);
         }
@@ -63,7 +83,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var normProbabilityInput = new NormProbabilityInput();
+            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -80,7 +101,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var normProbabilityInput = new NormProbabilityInput();
+            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
             {
                 Output = null
             };
@@ -94,7 +116,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var normProbabilityInput = new NormProbabilityInput();
+            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -108,7 +131,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput);
+            var normProbabilityInput = new NormProbabilityInput();
+            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput);
 
             // Call
             ICalculationInput input = calculation.GetObservableInput();
@@ -122,7 +146,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var normProbabilityInput = new NormProbabilityInput();
+            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
             {
                 Output = new TestHeightStructuresOutput()
             };