Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs
===================================================================
diff -u -r2aa7e3074d5549e4bcf269154529845a47c0b525 -r0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs)	(revision 2aa7e3074d5549e4bcf269154529845a47c0b525)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs)	(revision 0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2)
@@ -21,6 +21,9 @@
 
 using System;
 using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.Revetment.Data;
@@ -40,17 +43,24 @@
             var calculation = new TestWaveConditionsCalculation();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
+            mocks.ReplayAll();
+
             // Call
             var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(input,
                                                                                   calculation,
-                                                                                  failureMechanism);
+                                                                                  failureMechanism,
+                                                                                  assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<WaveConditionsInputContext>(context);
             Assert.AreSame(input, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
+            Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(failureMechanism.HydraulicBoundaryLocations, context.HydraulicBoundaryLocations);
             Assert.AreSame(failureMechanism.ForeshoreProfiles, context.ForeshoreProfiles);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -60,14 +70,20 @@
             var input = new WaveConditionsInput();
             var calculation = new TestWaveConditionsCalculation();
 
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
+            mocks.ReplayAll();
+
             // Call
             TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsInputContext(input,
                                                                                               calculation,
-                                                                                              null);
+                                                                                              null,
+                                                                                              assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("failureMechanism", exception.ParamName);
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs
===================================================================
diff -u -ra1e4c99571d88964493324126c158556a9e25375 -r0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs	(.../StabilityStoneCoverWaveConditionsInputContext.cs)	(revision a1e4c99571d88964493324126c158556a9e25375)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs	(.../StabilityStoneCoverWaveConditionsInputContext.cs)	(revision 0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2)
@@ -36,8 +36,6 @@
     /// </summary>
     public class StabilityStoneCoverWaveConditionsInputContext : WaveConditionsInputContext
     {
-        private readonly IAssessmentSection assessmentSection;
-
         /// <summary>
         /// Creates a new instance of <see cref="StabilityStoneCoverWaveConditionsInputContext"/>.
         /// </summary>
@@ -49,25 +47,22 @@
         public StabilityStoneCoverWaveConditionsInputContext(WaveConditionsInput wrappedData,
                                                              ICalculation<WaveConditionsInput> calculation,
                                                              IEnumerable<ForeshoreProfile> foreshoreProfiles,
-                                                             IAssessmentSection assessmentSection) : base(wrappedData, calculation)
+                                                             IAssessmentSection assessmentSection)
+            : base(wrappedData, calculation, assessmentSection)
         {
             if (foreshoreProfiles == null)
             {
                 throw new ArgumentNullException(nameof(foreshoreProfiles));
             }
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
+
             ForeshoreProfiles = foreshoreProfiles;
-            this.assessmentSection = assessmentSection;
         }
 
         public override IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
         {
             get
             {
-                return assessmentSection.HydraulicBoundaryDatabase.Locations;
+                return AssessmentSection.HydraulicBoundaryDatabase.Locations;
             }
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs
===================================================================
diff -u -r5826b97a9ae0135d6b9a272605243bfc0ef33995 -r0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextTest.cs)	(revision 5826b97a9ae0135d6b9a272605243bfc0ef33995)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextTest.cs)	(revision 0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2)
@@ -23,7 +23,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Data;
@@ -58,6 +57,7 @@
             Assert.IsInstanceOf<WaveConditionsInputContext>(context);
             Assert.AreSame(calculation.InputParameters, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
+            Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(foreshoreProfiles, context.ForeshoreProfiles);
             Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, context.HydraulicBoundaryLocations);
             mocks.VerifyAll();
@@ -84,26 +84,5 @@
             Assert.AreEqual("foreshoreProfiles", exception.ParamName);
             mocks.VerifyAll();
         }
-
-        [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var calculation = new StabilityStoneCoverWaveConditionsCalculation();
-            var foreshoreProfiles = new[]
-            {
-                new TestForeshoreProfile()
-            };
-
-            // Call
-            TestDelegate test = () => new StabilityStoneCoverWaveConditionsInputContext(calculation.InputParameters,
-                                                                                        calculation,
-                                                                                        foreshoreProfiles,
-                                                                                        null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("assessmentSection", exception.ParamName);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs
===================================================================
diff -u -ra1e4c99571d88964493324126c158556a9e25375 -r0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision a1e4c99571d88964493324126c158556a9e25375)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision 0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2)
@@ -35,8 +35,6 @@
     /// </summary>
     public class WaveImpactAsphaltCoverWaveConditionsInputContext : WaveConditionsInputContext
     {
-        private readonly IAssessmentSection assessmentSection;
-
         /// <summary>
         /// Creates a new instance of <see cref="WaveImpactAsphaltCoverWaveConditionsInputContext"/>.
         /// </summary>
@@ -49,25 +47,21 @@
                                                                 ICalculation<WaveConditionsInput> calculation,
                                                                 IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                                 IAssessmentSection assessmentSection)
-            : base(wrappedData, calculation)
+            : base(wrappedData, calculation, assessmentSection)
         {
             if (foreshoreProfiles == null)
             {
                 throw new ArgumentNullException(nameof(foreshoreProfiles));
             }
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
+
             ForeshoreProfiles = foreshoreProfiles;
-            this.assessmentSection = assessmentSection;
         }
 
         public override IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
         {
             get
             {
-                return assessmentSection.HydraulicBoundaryDatabase.Locations;
+                return AssessmentSection.HydraulicBoundaryDatabase.Locations;
             }
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs
===================================================================
diff -u -r5826b97a9ae0135d6b9a272605243bfc0ef33995 -r0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs)	(revision 5826b97a9ae0135d6b9a272605243bfc0ef33995)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs)	(revision 0df9dceeda4ff12e4b57d43b6c7bfd3e4739abf2)
@@ -23,7 +23,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.Data;
@@ -58,6 +57,7 @@
             Assert.IsInstanceOf<WaveConditionsInputContext>(context);
             Assert.AreSame(calculation.InputParameters, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
+            Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(foreshoreProfiles, context.ForeshoreProfiles);
             Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, context.HydraulicBoundaryLocations);
             mocks.VerifyAll();
@@ -84,26 +84,5 @@
             Assert.AreEqual("foreshoreProfiles", exception.ParamName);
             mocks.VerifyAll();
         }
-
-        [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
-            var foreshoreProfiles = new[]
-            {
-                new TestForeshoreProfile()
-            };
-
-            // Call
-            TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContext(calculation.InputParameters,
-                                                                                           calculation,
-                                                                                           foreshoreProfiles,
-                                                                                           null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("assessmentSection", exception.ParamName);
-        }
     }
 }
\ No newline at end of file