Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r277048d204ab4cfad4aa5de4d57ef38b56642c25 -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79)
@@ -267,10 +267,7 @@
                                                                 assessmentSectionStub);
 
             var newStructure = new TestHeightStructure();
-            var handler = new ObservableSetPropertyValueAfterConfirmationParameterTester<HeightStructure>(
-                calculation.InputParameters,
-                newStructure,
-                Enumerable.Empty<IObservable>());
+            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new HeightStructuresInputContextProperties(inputContext, handler);
 
             failureMechanism.AddSection(new FailureMechanismSection("Section", new List<Point2D>
@@ -293,13 +290,10 @@
         {
             RoundedDouble newMean = new Random(21).NextRoundedDouble();
             SetPropertyAndVerifyNotifcationsAndOutput(
-                properties => properties.LevelCrestStructure.Mean = newMean,
-                newMean);
+                properties => properties.LevelCrestStructure.Mean = newMean);
         }
 
-        private void SetPropertyAndVerifyNotifcationsAndOutput<TPropertyValue>(
-            Action<HeightStructuresInputContextProperties> setProperty,
-            TPropertyValue expectedValueSet)
+        private void SetPropertyAndVerifyNotifcationsAndOutput(Action<HeightStructuresInputContextProperties> setProperty)
         {
             // Setup
             var observable = mockRepository.StrictMock<IObservable>();
@@ -312,10 +306,7 @@
             HeightStructuresInput input = calculation.InputParameters;
             input.ForeshoreProfile = new TestForeshoreProfile();
 
-            var customHandler = new ObservableSetPropertyValueAfterConfirmationParameterTester<TPropertyValue>(
-                input,
-                expectedValueSet,
-                new[]
+            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
                 {
                     observable
                 });