Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 -ra39d26aede57670b45cdd5329893674cbb1bcb90
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision a39d26aede57670b45cdd5329893674cbb1bcb90)
@@ -89,9 +89,7 @@
             {
                 CreateInstance = context => new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(
                     context,
-                    () => context.FailureMechanism.GetAssessmentLevel(context.AssessmentSection,
-                                                                      context.Calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                      context.Calculation.InputParameters.CategoryType),
+                    () => WaveConditionsInputHelper.GetAssessmentLevel(context.WrappedData, context.AssessmentSection),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
         }
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -r34ae183aaf6141f5d956743e3026130bb56938f3 -ra39d26aede57670b45cdd5329893674cbb1bcb90
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs)	(revision 34ae183aaf6141f5d956743e3026130bb56938f3)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs)	(revision a39d26aede57670b45cdd5329893674cbb1bcb90)
@@ -19,17 +19,18 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Linq;
+using Core.Common.Base.Data;
 using Core.Gui.Plugin;
 using Core.Gui.PropertyBag;
 using NUnit.Framework;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.Hydraulics;
 using Riskeer.GrassCoverErosionOutwards.Data;
-using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Riskeer.GrassCoverErosionOutwards.Forms.PropertyClasses;
+using Riskeer.Revetment.Data;
+using Riskeer.Revetment.Data.TestUtil;
 
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.PropertyInfos
 {
@@ -52,30 +53,22 @@
         }
 
         [Test]
-        [TestCaseSource(
-            typeof(GrassCoverErosionOutwardsAssessmentSectionTestHelper),
-            nameof(GrassCoverErosionOutwardsAssessmentSectionTestHelper.GetHydraulicBoundaryLocationCalculationConfigurationPerFailureMechanismCategoryType))]
-        public void CreateInstance_WithContextThatHasInputWithSpecificCategoryType_ExpectedProperties(
+        [TestCaseSource(typeof(WaveConditionsInputTestHelper),
+                        nameof(WaveConditionsInputTestHelper.GetAssessmentLevelConfigurationPerWaterLevelType))]
+        public void CreateInstance_WithContextThatHasInputWithSpecificWaterLevelType_ExpectedProperties(
             IAssessmentSection assessmentSection,
-            GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-            HydraulicBoundaryLocation hydraulicBoundaryLocation,
-            FailureMechanismCategoryType categoryType,
-            HydraulicBoundaryLocationCalculation expectedHydraulicBoundaryLocationCalculation)
+            Action<WaveConditionsInput> configureInputAction,
+            RoundedDouble expectedAssessmentLevel)
         {
             // Setup
-            var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
-            {
-                InputParameters =
-                {
-                    HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = categoryType
-                }
-            };
+            var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
 
+            configureInputAction(calculation.InputParameters);
+
             var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(calculation.InputParameters,
                                                                                   calculation,
                                                                                   assessmentSection,
-                                                                                  failureMechanism);
+                                                                                  new GrassCoverErosionOutwardsFailureMechanism());
 
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
@@ -88,8 +81,7 @@
                 Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveConditionsInputContextProperties>(objectProperties);
                 Assert.AreSame(context, objectProperties.Data);
 
-                Assert.AreEqual(expectedHydraulicBoundaryLocationCalculation.Output.Result,
-                                ((GrassCoverErosionOutwardsWaveConditionsInputContextProperties) objectProperties).AssessmentLevel);
+                Assert.AreEqual(expectedAssessmentLevel, ((GrassCoverErosionOutwardsWaveConditionsInputContextProperties) objectProperties).AssessmentLevel);
             }
         }
 
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -raca3da3e587519ce6159390fa2e9362fcf4bd377 -ra39d26aede57670b45cdd5329893674cbb1bcb90
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision aca3da3e587519ce6159390fa2e9362fcf4bd377)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision a39d26aede57670b45cdd5329893674cbb1bcb90)
@@ -84,7 +84,7 @@
             {
                 CreateInstance = context => new StabilityStoneCoverWaveConditionsInputContextProperties(
                     context,
-                    () => WaveConditionsInputHelper.GetAssessmentLevel(context.Calculation.InputParameters, context.AssessmentSection),
+                    () => WaveConditionsInputHelper.GetAssessmentLevel(context.WrappedData, context.AssessmentSection),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
         }
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r35fd7a16c97e1be6e1f30996495ff0d9b61b8591 -ra39d26aede57670b45cdd5329893674cbb1bcb90
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 35fd7a16c97e1be6e1f30996495ff0d9b61b8591)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision a39d26aede57670b45cdd5329893674cbb1bcb90)
@@ -81,7 +81,7 @@
             {
                 CreateInstance = context => new WaveImpactAsphaltCoverWaveConditionsInputContextProperties(
                     context,
-                    () => WaveConditionsInputHelper.GetAssessmentLevel(context.Calculation.InputParameters, context.AssessmentSection),
+                    () => WaveConditionsInputHelper.GetAssessmentLevel(context.WrappedData, context.AssessmentSection),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
         }