Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rf07d6418a5280c74ea8a35de183dbaed51dda066 -rf58d4ec32b0a22b91b0e65d1608a65ff47859ee0
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision f07d6418a5280c74ea8a35de183dbaed51dda066)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision f58d4ec32b0a22b91b0e65d1608a65ff47859ee0)
@@ -515,65 +515,59 @@
             const double assessmentLevel1 = 1.1;
             const double assessmentLevel2 = 2.2;
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+
+            assessmentSection.SetHydraulicBoundaryLocationCalculations(new [] { hydraulicBoundaryLocation });
+            assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel1);
+            assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0).Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel2);
+
+            var grassCoverErosionOutwardsWaveConditionsCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                DesignWaterLevelCalculation1 =
+                InputParameters =
                 {
-                    Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel1)
-                },
-                DesignWaterLevelCalculation3 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel2)
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var waveConditionsInput = new WaveConditionsInput
-            {
-                HydraulicBoundaryLocation = hydraulicBoundaryLocation
-            };
-
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-
             yield return new TestCaseData(
                     new GrassCoverErosionOutwardsWaveConditionsInputContext(
-                        waveConditionsInput,
-                        new GrassCoverErosionOutwardsWaveConditionsCalculation
-                        {
-                            InputParameters =
-                            {
-                                HydraulicBoundaryLocation = hydraulicBoundaryLocation
-                            }
-                        },
+                        grassCoverErosionOutwardsWaveConditionsCalculation.InputParameters,
+                        grassCoverErosionOutwardsWaveConditionsCalculation,
                         assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism()),
                     assessmentLevel1)
                 .SetName("Grass outwards input context");
 
+            var stabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+
             yield return new TestCaseData(
                     new StabilityStoneCoverWaveConditionsInputContext(
-                        waveConditionsInput,
-                        new StabilityStoneCoverWaveConditionsCalculation
-                        {
-                            InputParameters =
-                            {
-                                HydraulicBoundaryLocation = hydraulicBoundaryLocation
-                            }
-                        },
+                        stabilityStoneCoverWaveConditionsCalculation.InputParameters,
+                        stabilityStoneCoverWaveConditionsCalculation,
                         assessmentSection,
                         new ForeshoreProfile[0]),
                     assessmentLevel2)
                 .SetName("Stability stone cover input context");
 
+            var waveImpactAsphaltCoverWaveConditionsCalculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+
             yield return new TestCaseData(
                     new WaveImpactAsphaltCoverWaveConditionsInputContext(
-                        waveConditionsInput,
-                        new WaveImpactAsphaltCoverWaveConditionsCalculation
-                        {
-                            InputParameters =
-                            {
-                                HydraulicBoundaryLocation = hydraulicBoundaryLocation
-                            }
-                        },
+                        waveImpactAsphaltCoverWaveConditionsCalculation.InputParameters,
+                        waveImpactAsphaltCoverWaveConditionsCalculation,
                         assessmentSection,
                         new ForeshoreProfile[0]),
                     assessmentLevel2)