Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r44da0eb83e4b49a7ca0d85c14340ad6604e681ee -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision 44da0eb83e4b49a7ca0d85c14340ad6604e681ee)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -688,7 +688,7 @@
             const int overflow = 1;
             string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.CurrentCulture), overflow);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -719,7 +719,7 @@
                                                                  assessmentSection);
 
             string newProbabilityString = newValue.ToString("r", CultureInfo.CurrentCulture);
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -748,7 +748,7 @@
                                                                  failureMechanism,
                                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -775,7 +775,7 @@
                                                                  failureMechanism,
                                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -807,7 +807,7 @@
             const int overflow = 1;
             string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.CurrentCulture), overflow);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -836,7 +836,7 @@
                                                                  failureMechanism,
                                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -863,7 +863,7 @@
                                                                  failureMechanism,
                                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -895,7 +895,7 @@
             const int overflow = 1;
             string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.CurrentCulture), overflow);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -924,7 +924,7 @@
                                                                  failureMechanism,
                                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -951,7 +951,7 @@
                                                                  failureMechanism,
                                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -978,7 +978,7 @@
                                                                  assessmentSection);
 
             var newStructure = new TestClosingStructure();
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new ClosingStructuresInputContextProperties(inputContext, handler);
 
             failureMechanism.AddSection(new FailureMechanismSection("Section", new List<Point2D>
@@ -1139,7 +1139,7 @@
             input.ForeshoreProfile = new TestForeshoreProfile();
             input.Structure = new TestClosingStructure();
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs
===================================================================
diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs	(.../DistributionPropertiesBaseTest.cs)	(revision 3178e116f5e59e03078d465efeb303c5e232c7bf)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs	(.../DistributionPropertiesBaseTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -218,7 +218,7 @@
             mocks.ReplayAll();
 
             var newMeanValue = new RoundedDouble(3, 20);
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observerable
             });
@@ -273,7 +273,7 @@
             mocks.ReplayAll();
 
             var newStandardDeviationValue = new RoundedDouble(3, 20);
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observerable
             });
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -r1bbf51443c907b5f202e80764fa05f2e7f842c04 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision 1bbf51443c907b5f202e80764fa05f2e7f842c04)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -655,7 +655,7 @@
 
             var newStructure = new TestStructure(new Point2D(0, 190));
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+            SetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables();
 
             var properties = new SimpleStructuresInputProperties(
@@ -876,7 +876,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+            SetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables();
 
             var properties = new SimpleStructuresInputProperties(
@@ -912,7 +912,7 @@
                                                       assessmentSection);
 
             var newStructure = new TestStructure();
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+            SetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables();
 
             var properties = new SimpleStructuresInputProperties(
@@ -950,7 +950,7 @@
                                                       assessmentSection);
 
             string newStringValue = newValue.ToString(CultureInfo.InvariantCulture);
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+            SetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables();
 
             var properties = new SimpleStructuresInputProperties(
@@ -987,7 +987,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+            SetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables();
 
             var properties = new SimpleStructuresInputProperties(
@@ -1022,7 +1022,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+            SetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables();
 
             var properties = new SimpleStructuresInputProperties(
@@ -1045,9 +1045,9 @@
             mockRepository.VerifyAll();
         }
 
-        private static CalculationInputSetPropertyValueAfterConfirmationParameterTester CreateCustomHandlerForCalculationReturningNoObservables()
+        private static SetPropertyValueAfterConfirmationParameterTester CreateCustomHandlerForCalculationReturningNoObservables()
         {
-            return new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            return new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
         }
 
         private static StructuresInputBaseProperties<
@@ -1192,7 +1192,7 @@
             input.ForeshoreProfile = new TestForeshoreProfile();
             input.Structure = new TestStructure();
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs
===================================================================
diff -u -r081badaad87a6e2a6d5c861de9ee95fa1ca6dea3 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision 081badaad87a6e2a6d5c861de9ee95fa1ca6dea3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -233,7 +233,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseForeshorePropertiesTest.cs
===================================================================
diff -u -r081badaad87a6e2a6d5c861de9ee95fa1ca6dea3 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseForeshorePropertiesTest.cs	(.../UseForeshorePropertiesTest.cs)	(revision 081badaad87a6e2a6d5c861de9ee95fa1ca6dea3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseForeshorePropertiesTest.cs	(.../UseForeshorePropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -194,7 +194,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/VariationCoefficientDistributionPropertiesBaseTest.cs
===================================================================
diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/VariationCoefficientDistributionPropertiesBaseTest.cs	(.../VariationCoefficientDistributionPropertiesBaseTest.cs)	(revision 3178e116f5e59e03078d465efeb303c5e232c7bf)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/VariationCoefficientDistributionPropertiesBaseTest.cs	(.../VariationCoefficientDistributionPropertiesBaseTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -220,7 +220,7 @@
             mocks.ReplayAll();
 
             var newMeanValue = new RoundedDouble(3, 20);
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observerable
             });
@@ -272,7 +272,7 @@
             mocks.ReplayAll();
 
             var newCoefficientOfVariation = new RoundedDouble(3, 20);
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observerable
             });
Fisheye: Tag bcdabbbbd7fae323c339fdabc8bcb390962ccbcc refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj	(.../Ringtoets.Common.Forms.TestUtil.Test.csproj)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj	(.../Ringtoets.Common.Forms.TestUtil.Test.csproj)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -50,7 +50,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs" />
+    <Compile Include="SetPropertyValueAfterConfirmationParameterTesterTest.cs" />
     <Compile Include="CalculationTestHelperTest.cs" />
     <Compile Include="ControlTestHelperTest.cs" />
     <Compile Include="DistributionPropertiesTestHelperTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/SetPropertyValueAfterConfirmationParameterTesterTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/SetPropertyValueAfterConfirmationParameterTesterTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/SetPropertyValueAfterConfirmationParameterTesterTest.cs	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -0,0 +1,86 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base;
+using NUnit.Framework;
+using Ringtoets.Common.Forms.PropertyClasses;
+
+namespace Ringtoets.Common.Forms.TestUtil.Test
+{
+    [TestFixture]
+    public class SetPropertyValueAfterConfirmationParameterTesterTest
+    {
+        [Test]
+        public void Constructructed_Always_PropertiesSet()
+        {
+            // Setup
+            IEnumerable<IObservable> returnedAffectedObjects = Enumerable.Empty<IObservable>();
+
+            // Call
+            var tester = new SetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
+
+            // Assert
+            Assert.IsInstanceOf<IObservablePropertyChangeHandler>(tester);
+            Assert.AreSame(returnedAffectedObjects, tester.ReturnedAffectedObjects);
+            Assert.IsFalse(tester.Called);
+        }
+
+        [Test]
+        public void SetPropertyValueAfterConfirmation_ParametersAreSameAndEqual_SetValueCalledReturnsGivenAffectedObjects()
+        {
+            // Setup
+            IEnumerable<IObservable> returnedAffectedObjects = Enumerable.Empty<IObservable>();
+            var called = 0;
+
+            var tester = new SetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
+
+            // Call
+            IEnumerable<IObservable> affectedObjects = tester.SetPropertyValueAfterConfirmation(() => called++);
+
+            // Assert
+            Assert.AreEqual(1, called);
+            Assert.AreSame(returnedAffectedObjects, affectedObjects);
+            Assert.IsTrue(tester.Called);
+        }
+
+        [Test]
+        public void SetPropertyValueAfterConfirmation_SetValueThrowsException_BubblesException()
+        {
+            // Setup
+            IEnumerable<IObservable> returnedAffectedObjects = Enumerable.Empty<IObservable>();
+
+            var tester = new SetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
+
+            var expectedException = new Exception();
+
+            // Call
+            TestDelegate test = () => tester.SetPropertyValueAfterConfirmation(() => { throw expectedException; });
+
+            // Assert
+            var exception = Assert.Throws<Exception>(test);
+            Assert.AreSame(expectedException, exception);
+            Assert.IsTrue(tester.Called);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag bcdabbbbd7fae323c339fdabc8bcb390962ccbcc refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationInputSetPropertyValueAfterConfirmationParameterTester.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -50,7 +50,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="CalculationInputSetPropertyValueAfterConfirmationParameterTester.cs" />
+    <Compile Include="SetPropertyValueAfterConfirmationParameterTester.cs" />
     <Compile Include="CalculationTestHelper.cs" />
     <Compile Include="ControlTestHelper.cs" />
     <Compile Include="DistributionPropertiesTestHelper.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/SetPropertyValueAfterConfirmationParameterTester.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/SetPropertyValueAfterConfirmationParameterTester.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/SetPropertyValueAfterConfirmationParameterTester.cs	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -0,0 +1,60 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.Base;
+using Ringtoets.Common.Forms.PropertyClasses;
+
+namespace Ringtoets.Common.Forms.TestUtil
+{
+    /// <summary>
+    /// This class can be used in tests to verify that the correct arguments 
+    /// are passed to the <see cref="IObservablePropertyChangeHandler.SetPropertyValueAfterConfirmation"/> method.
+    /// </summary>
+    public class SetPropertyValueAfterConfirmationParameterTester : IObservablePropertyChangeHandler
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="SetPropertyValueAfterConfirmationParameterTester"/>.
+        /// </summary>
+        /// <param name="returnedAffectedObjects">The affected object that are returned by <see cref="SetPropertyValueAfterConfirmation"/>.</param>
+        public SetPropertyValueAfterConfirmationParameterTester(IEnumerable<IObservable> returnedAffectedObjects)
+        {
+            ReturnedAffectedObjects = returnedAffectedObjects;
+        }
+
+        /// <summary>
+        /// Gets a value representing whether <see cref="SetPropertyValueAfterConfirmation"/> was called.
+        /// </summary>
+        public bool Called { get; private set; }
+
+        /// <summary>
+        /// Gets the affected object that are returned by <see cref="SetPropertyValueAfterConfirmation"/>.
+        /// </summary>
+        public IEnumerable<IObservable> ReturnedAffectedObjects { get; }
+
+        public IEnumerable<IObservable> SetPropertyValueAfterConfirmation(SetObservablePropertyValueDelegate setValue)
+        {
+            Called = true;
+            setValue();
+            return ReturnedAffectedObjects;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r1bbf51443c907b5f202e80764fa05f2e7f842c04 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 1bbf51443c907b5f202e80764fa05f2e7f842c04)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -621,7 +621,7 @@
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection);
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, customHandler);
 
             IEnumerable<SelectableHydraulicBoundaryLocation> originalList =
@@ -818,7 +818,7 @@
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsInputContextPropertiesIntegrationTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsInputContextPropertiesIntegrationTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesIntegrationTest.cs)	(revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsInputContextPropertiesIntegrationTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesIntegrationTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -88,7 +88,7 @@
 
             var inputContext = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSection);
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, customHandler);
 
             // Call
@@ -153,7 +153,7 @@
 
             var inputContext = new GrassCoverErosionInwardsInputContext(calculation1.InputParameters, calculation1, failureMechanism, assessmentSection);
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, customHandler);
 
             // Call
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r44da0eb83e4b49a7ca0d85c14340ad6604e681ee -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 44da0eb83e4b49a7ca0d85c14340ad6604e681ee)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -296,7 +296,7 @@
                                                                 assessmentSection);
 
             var newStructure = new TestHeightStructure();
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new HeightStructuresInputContextProperties(inputContext, handler);
 
             failureMechanism.AddSection(new FailureMechanismSection("Section", new List<Point2D>
@@ -335,7 +335,7 @@
             input.ForeshoreProfile = new TestForeshoreProfile();
             input.Structure = new TestHeightStructure();
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -485,7 +485,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -525,7 +525,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -615,7 +615,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -707,7 +707,7 @@
 
             MacroStabilityInwardsSurfaceLine newSurfaceLine = ValidSurfaceLine(0, 2);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
             var properties = new MacroStabilityInwardsInputContextProperties(context, handler);
 
@@ -811,7 +811,7 @@
 
             MacroStabilityInwardsSurfaceLine newSurfaceLine = ValidSurfaceLine(0, 2);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
             var properties = new MacroStabilityInwardsInputContextProperties(context, handler);
 
@@ -865,7 +865,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1294,7 +1294,7 @@
             MacroStabilityInwardsSurfaceLine newSurfaceLine = ValidSurfaceLine(0.0, 5.0);
             newSurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0, 190);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1470,7 +1470,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs
===================================================================
diff -u -r07783a47e1cfb0bd793eaba29c7567cb17e0b367 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs	(.../MacroStabilityInwardsCalculationRowTest.cs)	(revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs	(.../MacroStabilityInwardsCalculationRowTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -319,7 +319,7 @@
             var observable = mocks.StrictMock<IObservable>();
             mocks.ReplayAll();
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(
                 new[]
                 {
                     observable
@@ -346,7 +346,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(
                 new[]
                 {
                     observable
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -raa49537188229065df91b1a931f088c32115702a -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision aa49537188229065df91b1a931f088c32115702a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -849,7 +849,7 @@
                                                  assessmentSection);
 
             var newExitPointL = (RoundedDouble) newExitPoint;
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -895,7 +895,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -941,7 +941,7 @@
 
             var entryPointL = (RoundedDouble) (-15.0);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -986,7 +986,7 @@
 
             var exitPointL = (RoundedDouble) 10.0;
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1025,7 +1025,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1065,7 +1065,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1155,7 +1155,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1247,7 +1247,7 @@
 
             PipingSurfaceLine newSurfaceLine = ValidSurfaceLine(0, 2);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
             var properties = new PipingInputContextProperties(context, handler);
 
@@ -1351,7 +1351,7 @@
 
             PipingSurfaceLine newSurfaceLine = ValidSurfaceLine(0, 2);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
             var properties = new PipingInputContextProperties(context, handler);
 
@@ -1405,7 +1405,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -1877,7 +1877,7 @@
             PipingSurfaceLine newSurfaceLine = ValidSurfaceLine(0.0, 5.0);
             newSurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0, 190);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
@@ -2053,7 +2053,7 @@
                                                  failureMechanism,
                                                  assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -r16df8541528639fd1e8d9f2584fae28808b63fad -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 16df8541528639fd1e8d9f2584fae28808b63fad)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -510,7 +510,7 @@
             var observable = mocks.StrictMock<IObservable>();
             mocks.ReplayAll();
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(
                 new[]
                 {
                     observable
@@ -537,7 +537,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(
                 new[]
                 {
                     observable
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision fe90a6d174a01975381e6cda55ed1f7f4e831a51)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -597,7 +597,7 @@
             var inputContext = new TestWaveConditionsInputContext(input, calculation, new ForeshoreProfile[0], locations);
 
             var otherProfile = new TestForeshoreProfile(new Point2D(0, 190));
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new TestWaveConditionsInputContextProperties(inputContext, customHandler);
 
             IEnumerable<SelectableHydraulicBoundaryLocation> originalList = properties.GetSelectableHydraulicBoundaryLocations()
@@ -658,7 +658,7 @@
                                                              new ForeshoreProfile[0],
                                                              new HydraulicBoundaryLocation[0]);
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r44da0eb83e4b49a7ca0d85c14340ad6604e681ee -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision 44da0eb83e4b49a7ca0d85c14340ad6604e681ee)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
@@ -1453,7 +1453,7 @@
             const int overflow = 1;
             string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.CurrentCulture), overflow);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -1482,7 +1482,7 @@
                                                                         failureMechanism,
                                                                         assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -1509,7 +1509,7 @@
                                                                         failureMechanism,
                                                                         assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -1541,7 +1541,7 @@
             const int overflow = 1;
             string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.CurrentCulture), overflow);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -1570,7 +1570,7 @@
                                                                         failureMechanism,
                                                                         assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -1597,7 +1597,7 @@
                                                                         failureMechanism,
                                                                         assessmentSection);
 
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Call
@@ -1624,7 +1624,7 @@
                                                                         assessmentSection);
 
             var newStructure = new TestStabilityPointStructure();
-            var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
+            var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty<IObservable>());
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             failureMechanism.AddSection(new FailureMechanismSection("Section", new List<Point2D>
@@ -1811,7 +1811,7 @@
             input.ForeshoreProfile = new TestForeshoreProfile();
             input.Structure = new TestStabilityPointStructure();
 
-            var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
+            var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
                 observable
             });