Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs
===================================================================
diff -u -r695dc056718910d43896faab4b65a09944ad18cb -rc1125974b0bb4296b2826b6da186e7ce72729f64
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs)	(revision 695dc056718910d43896faab4b65a09944ad18cb)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs)	(revision c1125974b0bb4296b2826b6da186e7ce72729f64)
@@ -61,15 +61,15 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>();
-            var inputMock = mockRepository.StrictMock<GrassCoverErosionInwardsInput>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
+            var input = new GrassCoverErosionInwardsInput();
             var properties = new GrassCoverErosionInwardsInputContextBreakWaterProperties();
 
             // Call
-            properties.Data = new GrassCoverErosionInwardsInputContext(inputMock, calculationMock, failureMechanismMock, assessmentSectionMock);
+            properties.Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
             Assert.IsFalse(properties.UseBreakWater);
@@ -86,17 +86,18 @@
             const int numberProperties = 3;
             observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var input = new GrassCoverErosionInwardsInput();
-            input.Attach(observerMock);
             var properties = new GrassCoverErosionInwardsInputContextBreakWaterProperties
             {
-                Data = new GrassCoverErosionInwardsInputContext(input, calculationMock, failureMechanismMock, assessmentSectionMock)
+                Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionMock)
             };
 
+            input.Attach(observerMock);
+
             RoundedDouble newBreakWaterHeight = new RoundedDouble(2, 9);
             const BreakWaterType newBreakWaterType = BreakWaterType.Wall;
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs
===================================================================
diff -u -r7461afe37bcf85d746168f3fde0ca01947ec888e -rc1125974b0bb4296b2826b6da186e7ce72729f64
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs)	(revision 7461afe37bcf85d746168f3fde0ca01947ec888e)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs)	(revision c1125974b0bb4296b2826b6da186e7ce72729f64)
@@ -60,15 +60,15 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var input = new GrassCoverErosionInwardsInput();
             var properties = new GrassCoverErosionInwardsInputContextDikeGeometryProperties();
 
             // Call
-            properties.Data = new GrassCoverErosionInwardsInputContext(input, calculationMock, failureMechanismMock, assessmentSectionMock);
+            properties.Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
             CollectionAssert.IsEmpty(properties.Coordinates);
@@ -81,10 +81,9 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             mockRepository.ReplayAll();
 
-            var properties = new GrassCoverErosionInwardsInputContextDikeGeometryProperties();
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var calculation = new GrassCoverErosionInwardsCalculation
             {
                 InputParameters =
@@ -99,9 +98,10 @@
                     }
                 }
             };
+            var properties = new GrassCoverErosionInwardsInputContextDikeGeometryProperties();
 
             // Call
-            properties.Data = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation, failureMechanismMock, assessmentSectionMock);
+            properties.Data = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
             var expectedCoordinates = new[]
@@ -124,16 +124,16 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var input = new GrassCoverErosionInwardsInput();
 
             // Call
             var properties = new GrassCoverErosionInwardsInputContextDikeGeometryProperties
             {
-                Data = new GrassCoverErosionInwardsInputContext(input, calculationMock, failureMechanismMock, assessmentSectionMock)
+                Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionMock)
             };
 
             // Assert
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs
===================================================================
diff -u -r695dc056718910d43896faab4b65a09944ad18cb -rc1125974b0bb4296b2826b6da186e7ce72729f64
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs)	(revision 695dc056718910d43896faab4b65a09944ad18cb)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs)	(revision c1125974b0bb4296b2826b6da186e7ce72729f64)
@@ -60,15 +60,15 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>();
-            var inputMock = mockRepository.StrictMock<GrassCoverErosionInwardsInput>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
+            var input = new GrassCoverErosionInwardsInput();
             var properties = new GrassCoverErosionInwardsInputContextForeshoreProperties();
 
             // Call
-            properties.Data = new GrassCoverErosionInwardsInputContext(inputMock, calculationMock, failureMechanismMock, assessmentSectionMock);
+            properties.Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
             Assert.IsFalse(properties.UseForeshore);
@@ -81,10 +81,9 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             mockRepository.ReplayAll();
 
-            var properties = new GrassCoverErosionInwardsInputContextForeshoreProperties();
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var calculation = new GrassCoverErosionInwardsCalculation
             {
                 InputParameters =
@@ -100,9 +99,10 @@
                     }
                 }
             };
+            var properties = new GrassCoverErosionInwardsInputContextForeshoreProperties();
 
             // Call
-            properties.Data = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation, failureMechanismMock, assessmentSectionMock);
+            properties.Data = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
             var expectedCoordinates = new[]
@@ -124,17 +124,18 @@
             const int numberProperties = 1;
             observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var input = new GrassCoverErosionInwardsInput();
-            input.Attach(observerMock);
             var properties = new GrassCoverErosionInwardsInputContextForeshoreProperties
             {
-                Data = new GrassCoverErosionInwardsInputContext(input, calculationMock, failureMechanismMock, assessmentSectionMock)
+                Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionMock)
             };
 
+            input.Attach(observerMock);
+
             // Call
             properties.UseForeshore = false;