Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r0c17207d7682c740778dc3e665b5f1dfc70c37dd -r277048d204ab4cfad4aa5de4d57ef38b56642c25
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 0c17207d7682c740778dc3e665b5f1dfc70c37dd)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
@@ -75,7 +75,7 @@
         public void Constructor_WithoutData_ExpectedValues()
         {
             // Setup
-            var handler = mockRepository.Stub<ICalculationInputPropertyChangeHandler>();
+            var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
             // Call
@@ -114,7 +114,7 @@
         {
             // Setup
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
-            var handler = mockRepository.Stub<ICalculationInputPropertyChangeHandler>();
+            var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -143,7 +143,7 @@
         {
             // Setup
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
-            var handler = mockRepository.Stub<ICalculationInputPropertyChangeHandler>();
+            var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -197,7 +197,7 @@
         {
             // Setup
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
-            var handler = mockRepository.Stub<ICalculationInputPropertyChangeHandler>();
+            var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism
@@ -227,7 +227,7 @@
         {
             // Setup
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
-            var handler = mockRepository.Stub<ICalculationInputPropertyChangeHandler>();
+            var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism
@@ -267,9 +267,8 @@
                                                                 assessmentSectionStub);
 
             var newStructure = new TestHeightStructure();
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester<HeightStructure>(
+            var handler = new ObservableSetPropertyValueAfterConfirmationParameterTester<HeightStructure>(
                 calculation.InputParameters,
-                calculation,
                 newStructure,
                 Enumerable.Empty<IObservable>());
             var properties = new HeightStructuresInputContextProperties(inputContext, handler);
@@ -313,9 +312,8 @@
             HeightStructuresInput input = calculation.InputParameters;
             input.ForeshoreProfile = new TestForeshoreProfile();
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester<TPropertyValue>(
+            var customHandler = new ObservableSetPropertyValueAfterConfirmationParameterTester<TPropertyValue>(
                 input,
-                calculation,
                 expectedValueSet,
                 new[]
                 {