Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -150,13 +150,7 @@
                         Name = "aCalculation",
                         InputParameters =
                         {
-                            HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
-                            {
-                                DesignWaterLevelCalculation1 =
-                                {
-                                    Output = new TestHydraulicBoundaryLocationOutput(28.36844)
-                                }
-                            },
+                            HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456),
                             ForeshoreProfile = new TestForeshoreProfile("foreshoreA"),
                             LowerBoundaryRevetment = (RoundedDouble) 1.384,
                             UpperBoundaryRevetment = (RoundedDouble) 11.54898963,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rab5044d23f83bbc1b8906f23a2a541162c6e6464 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision ab5044d23f83bbc1b8906f23a2a541162c6e6464)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -603,6 +604,10 @@
 
             return new AssessmentSection(AssessmentSectionComposition.Dike)
             {
+                FailureMechanismContribution =
+                {
+                    NormativeNorm = NormType.LowerLimit
+                },
                 HydraulicBoundaryDatabase =
                 {
                     FilePath = validFilePath,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -rab5044d23f83bbc1b8906f23a2a541162c6e6464 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision ab5044d23f83bbc1b8906f23a2a541162c6e6464)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -265,7 +265,6 @@
             mockRepository.ReplayAll();
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
-            calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = null;
 
             var isValid = true;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs
===================================================================
diff -u -r2a61453b3c465ad734985fb9f42352b76a6ab5bc -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -284,8 +284,8 @@
             input.SurfaceLine = surfaceLine;
 
             // Assert
-            Assert.AreEqual(2, input.EntryPointL, input.EntryPointL.GetAccuracy());
-            Assert.AreEqual(3, input.ExitPointL, input.ExitPointL.GetAccuracy());
+            Assert.AreEqual(1, input.EntryPointL, input.EntryPointL.GetAccuracy());
+            Assert.AreEqual(2, input.ExitPointL, input.ExitPointL.GetAccuracy());
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
===================================================================
diff -u -re444a84b4fbf8411cd3237eb2e836df68790652b -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision e444a84b4fbf8411cd3237eb2e836df68790652b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -610,7 +610,7 @@
 
                 // Assert
                 Assert.AreEqual(dataBeforeUpdate, view.Chart.Data);
-                mocks.VerifyAll(); // no update observer expected
+                mocks.VerifyAll(); // No update observer expected
             }
         }
 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/Ringtoets.Revetment.Forms.TestUtil.Test.csproj
===================================================================
diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/Ringtoets.Revetment.Forms.TestUtil.Test.csproj	(.../Ringtoets.Revetment.Forms.TestUtil.Test.csproj)	(revision 63fc151e9cf722527465c1eddfa6567a90feb5e6)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/Ringtoets.Revetment.Forms.TestUtil.Test.csproj	(.../Ringtoets.Revetment.Forms.TestUtil.Test.csproj)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -11,6 +11,9 @@
       <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/TestWaveConditionsInputContextTest.cs
===================================================================
diff -u -rbda1b9542e899c34dfa695d5e14411a4f52de809 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/TestWaveConditionsInputContextTest.cs	(.../TestWaveConditionsInputContextTest.cs)	(revision bda1b9542e899c34dfa695d5e14411a4f52de809)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/TestWaveConditionsInputContextTest.cs	(.../TestWaveConditionsInputContextTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -74,9 +76,12 @@
         public void Constructor_WithAllParameters_ExpectedValues()
         {
             // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var waveConditionsInput = new WaveConditionsInput();
             var calculation = new TestWaveConditionsCalculation();
-            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var profiles = new ForeshoreProfile[0];
             var locations = new HydraulicBoundaryLocation[0];
 
@@ -94,6 +99,7 @@
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(profiles, context.ForeshoreProfiles);
             Assert.AreSame(locations, context.HydraulicBoundaryLocations);
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/packages.config
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/packages.config	(.../packages.config)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil.Test/packages.config	(.../packages.config)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -23,4 +23,5 @@
 -->
 <packages>
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs	(.../WaveConditionsExporterBaseTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs	(.../WaveConditionsExporterBaseTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -121,13 +121,7 @@
             {
                 new ExportableWaveConditions("blocksName", new WaveConditionsInput
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
-                    {
-                        DesignWaterLevelCalculation1 =
-                        {
-                            Output = new TestHydraulicBoundaryLocationOutput(12.34567)
-                        }
-                    },
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0),
                     LowerBoundaryRevetment = (RoundedDouble) 5.68,
                     UpperBoundaryRevetment = (RoundedDouble) 7.214,
                     StepSize = WaveConditionsInputStepSize.One,
@@ -136,13 +130,7 @@
                 }, CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks),
                 new ExportableWaveConditions("columnsName", new WaveConditionsInput
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
-                    {
-                        DesignWaterLevelCalculation1 =
-                        {
-                            Output = new TestHydraulicBoundaryLocationOutput(28.36844)
-                        }
-                    },
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456),
                     LowerBoundaryRevetment = (RoundedDouble) 1.384,
                     UpperBoundaryRevetment = (RoundedDouble) 11.54898963,
                     StepSize = WaveConditionsInputStepSize.Half,
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs	(.../WaveConditionsWriterTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs	(.../WaveConditionsWriterTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -144,13 +144,7 @@
             {
                 new ExportableWaveConditions("blocksName", new WaveConditionsInput
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
-                    {
-                        DesignWaterLevelCalculation1 =
-                        {
-                            Output = new TestHydraulicBoundaryLocationOutput(12.34567)
-                        }
-                    },
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0),
                     LowerBoundaryRevetment = (RoundedDouble) 5.68,
                     UpperBoundaryRevetment = (RoundedDouble) 7.214,
                     StepSize = WaveConditionsInputStepSize.Half,
@@ -160,13 +154,7 @@
                 }, CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks),
                 new ExportableWaveConditions("columnsName", new WaveConditionsInput
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
-                    {
-                        DesignWaterLevelCalculation1 =
-                        {
-                            Output = new TestHydraulicBoundaryLocationOutput(28.36844)
-                        }
-                    },
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456),
                     LowerBoundaryRevetment = (RoundedDouble) 1.384,
                     UpperBoundaryRevetment = (RoundedDouble) 11.54898963,
                     StepSize = WaveConditionsInputStepSize.One,
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs
===================================================================
diff -u -r1ab13c60f0a6168b2e959bc213d229d2c77af3b6 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextTest.cs)	(revision 1ab13c60f0a6168b2e959bc213d229d2c77af3b6)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -43,9 +43,7 @@
                 new TestForeshoreProfile()
             };
 
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
 
             // Call
             var context = new StabilityStoneCoverWaveConditionsInputContext(calculation.InputParameters,
@@ -60,7 +58,6 @@
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(foreshoreProfiles, context.ForeshoreProfiles);
             Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, context.HydraulicBoundaryLocations);
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs	(.../StabilityStoneCoverWaveConditionsExporterTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs	(.../StabilityStoneCoverWaveConditionsExporterTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -143,13 +143,7 @@
                         Name = "aCalculation",
                         InputParameters =
                         {
-                            HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
-                            {
-                                DesignWaterLevelCalculation1 =
-                                {
-                                    Output = new TestHydraulicBoundaryLocationOutput(28.36844)
-                                }
-                            },
+                            HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456),
                             ForeshoreProfile = new TestForeshoreProfile("foreshoreA"),
                             LowerBoundaryRevetment = (RoundedDouble) 1.384,
                             UpperBoundaryRevetment = (RoundedDouble) 11.54898963,
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r03dedfcdc1cd61d80f3707a97cb8f3aa1ebe647b -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 03dedfcdc1cd61d80f3707a97cb8f3aa1ebe647b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -678,6 +679,10 @@
 
             return new AssessmentSection(AssessmentSectionComposition.Dike)
             {
+                FailureMechanismContribution =
+                {
+                    NormativeNorm = NormType.LowerLimit
+                },
                 HydraulicBoundaryDatabase =
                 {
                     FilePath = validFilePath,
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r80c49f33c35b73d7778f8beded83ad330208e690 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 80c49f33c35b73d7778f8beded83ad330208e690)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -264,7 +264,6 @@
             mockRepository.ReplayAll();
 
             StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation();
-            calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = null;
 
             var isValid = true;
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs
===================================================================
diff -u -r1ab13c60f0a6168b2e959bc213d229d2c77af3b6 -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs)	(revision 1ab13c60f0a6168b2e959bc213d229d2c77af3b6)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -43,9 +43,7 @@
                 new TestForeshoreProfile()
             };
 
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
 
             // Call
             var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(calculation.InputParameters,
@@ -60,7 +58,6 @@
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(foreshoreProfiles, context.ForeshoreProfiles);
             Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, context.HydraulicBoundaryLocations);
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -154,13 +154,7 @@
                         Name = "aCalculation",
                         InputParameters =
                         {
-                            HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
-                            {
-                                DesignWaterLevelCalculation1 =
-                                {
-                                    Output = new TestHydraulicBoundaryLocationOutput(28.36844)
-                                }
-                            },
+                            HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456),
                             ForeshoreProfile = new TestForeshoreProfile("foreshoreA"),
                             LowerBoundaryRevetment = (RoundedDouble) 1.384,
                             UpperBoundaryRevetment = (RoundedDouble) 11.54898963,
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r03dedfcdc1cd61d80f3707a97cb8f3aa1ebe647b -r72ab8a712b043d82de3925e0bffad7aea60cbf19
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 03dedfcdc1cd61d80f3707a97cb8f3aa1ebe647b)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 72ab8a712b043d82de3925e0bffad7aea60cbf19)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -505,6 +506,10 @@
 
             return new AssessmentSection(AssessmentSectionComposition.Dike)
             {
+                FailureMechanismContribution =
+                {
+                    NormativeNorm = NormType.LowerLimit
+                },
                 HydraulicBoundaryDatabase =
                 {
                     FilePath = validFilePath,