Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs
===================================================================
diff -u -r00f98bca57fd7b12bb85beecf341bbc19a7ea838 -r08783ca39a0beaf6c0efb1e8377d894cd3f3c346
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs)	(revision 00f98bca57fd7b12bb85beecf341bbc19a7ea838)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs)	(revision 08783ca39a0beaf6c0efb1e8377d894cd3f3c346)
@@ -20,22 +20,26 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects
 {
     /// <summary>
     /// Presentation object for <see cref="GrassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup"/>.
     /// </summary>
-    public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext : ObservableWrappedObjectContextBase<CalculationGroup>
+    public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext : GrassCoverErosionOutwardsContext<CalculationGroup>,
+                                                                                  ICalculationContext<CalculationGroup, GrassCoverErosionOutwardsFailureMechanism>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext"/> class.
         /// </summary>
         /// <param name="calculationGroup">The wrapped <see cref="CalculationGroup"/>.</param>
+        /// <param name="failureMechanism">The failure mechanism the calculation group belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
-        public GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(CalculationGroup calculationGroup) : base(calculationGroup) { }
+        public GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(CalculationGroup calculationGroup,
+                                                                              GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+            : base(calculationGroup, failureMechanism) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightLocationsContext.cs
===================================================================
diff -u -r8a90c409545ce1b48e018d3b5d6b5982dbef926f -r08783ca39a0beaf6c0efb1e8377d894cd3f3c346
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightLocationsContext.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContext.cs)	(revision 8a90c409545ce1b48e018d3b5d6b5982dbef926f)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightLocationsContext.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContext.cs)	(revision 08783ca39a0beaf6c0efb1e8377d894cd3f3c346)
@@ -23,7 +23,6 @@
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs
===================================================================
diff -u -r00f98bca57fd7b12bb85beecf341bbc19a7ea838 -r08783ca39a0beaf6c0efb1e8377d894cd3f3c346
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs)	(revision 00f98bca57fd7b12bb85beecf341bbc19a7ea838)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs)	(revision 08783ca39a0beaf6c0efb1e8377d894cd3f3c346)
@@ -19,9 +19,12 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.PresentationObjects
@@ -30,17 +33,49 @@
     public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest
     {
         [Test]
+        public void Constructor_CalculationGroupNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
+
+            // Call
+            TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(null, failureMechanism);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("wrappedData", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationGroup = new CalculationGroup();
+
+            // Call
+            TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+        }
+
+        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
             var calculationGroup = new CalculationGroup();
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
-            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup);
+            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<CalculationGroup>>(context);
+            Assert.IsInstanceOf<ICalculationContext<CalculationGroup, GrassCoverErosionOutwardsFailureMechanism>>(context);
+
             Assert.AreSame(calculationGroup, context.WrappedData);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
         }
     }
 }
\ No newline at end of file