Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs
===================================================================
diff -u -re5a11251693f46473c8d26294c75067f01ce088c -rd7ade6bfc94f45614a0d633a3932478a2cc980c3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs)	(revision e5a11251693f46473c8d26294c75067f01ce088c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs)	(revision d7ade6bfc94f45614a0d633a3932478a2cc980c3)
@@ -26,6 +26,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 
@@ -35,21 +36,6 @@
     public class GrassCoverErosionOutwardsWaveHeightCalculationsContextTest
     {
         [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
-
-            // Call
-            TestDelegate call = () => new GrassCoverErosionOutwardsWaveHeightCalculationsContext(calculations, null, failureMechanism);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("assessmentSection", paramName);
-        }
-
-        [Test]
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
@@ -60,7 +46,8 @@
             var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
             // Call
-            TestDelegate call = () => new GrassCoverErosionOutwardsWaveHeightCalculationsContext(calculations, assessmentSection, null);
+            TestDelegate call = () => new GrassCoverErosionOutwardsWaveHeightCalculationsContext(calculations, null, assessmentSection,
+                                                                                                 () => 0.1, "Test name");
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -73,20 +60,25 @@
         {
             // Setup
             var mockRepository = new MockRepository();
+            var calculations = mockRepository.Stub<IObservableEnumerable<HydraulicBoundaryLocationCalculation>>();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
+            Func<double> getNormFunc = () => 0.01;
+            const string categoryBoundaryName = "Test name";
 
             // Call
-            var context = new GrassCoverErosionOutwardsWaveHeightCalculationsContext(calculations, assessmentSection, failureMechanism);
+            var context = new GrassCoverErosionOutwardsWaveHeightCalculationsContext(calculations, failureMechanism, assessmentSection,
+                                                                                     getNormFunc, categoryBoundaryName);
 
             // Assert
-            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableList<HydraulicBoundaryLocationCalculation>>>(context);
+            Assert.IsInstanceOf<WaveHeightCalculationsContext>(context);
             Assert.AreSame(calculations, context.WrappedData);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
+            Assert.AreSame(getNormFunc, context.GetNormFunc);
+            Assert.AreEqual(categoryBoundaryName, context.CategoryBoundaryName);
             mockRepository.VerifyAll();
         }
     }