Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs	(.../LogNormalDistributionProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs	(.../LogNormalDistributionProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -21,16 +21,14 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.PropertyClasses
 {
     /// <summary>
-    /// An <see cref="ObjectProperties{T}"/> implementation for <see cref="LogNormalDistribution"/>
-    /// properties.
+    /// Properties class for implementations of <see cref="LogNormalDistribution"/>.
     /// </summary>
     public class LogNormalDistributionProperties : DistributionPropertiesBase<LogNormalDistribution>
     {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/NormalDistributionProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/NormalDistributionProperties.cs	(.../NormalDistributionProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/NormalDistributionProperties.cs	(.../NormalDistributionProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -21,16 +21,14 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.PropertyClasses
 {
     /// <summary>
-    /// An <see cref="ObjectProperties{T}"/> implementation for <see cref="NormalDistribution"/>
-    /// properties.
+    /// Properties class for implementations of <see cref="NormalDistribution"/>.
     /// </summary>
     public class NormalDistributionProperties : DistributionPropertiesBase<NormalDistribution>
     {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -rd5a0bce3d53deb3aef237c365018096e9bc83bb1 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision d5a0bce3d53deb3aef237c365018096e9bc83bb1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -68,7 +68,10 @@
         /// <param name="constructionProperties">The property values required to create an instance of <see cref="StructuresInputBaseProperties{TStructure, TStructureInput, TCalculation, TFailureMechanism}"/>.</param>
         /// <param name="propertyChangeHandler">The handler responsible for handling effects of a property change.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        protected StructuresInputBaseProperties(InputContextBase<TStructureInput, TCalculation, TFailureMechanism> data, ConstructionProperties constructionProperties, IObservablePropertyChangeHandler propertyChangeHandler)
+        protected StructuresInputBaseProperties(
+            InputContextBase<TStructureInput, TCalculation, TFailureMechanism> data,
+            ConstructionProperties constructionProperties,
+            IObservablePropertyChangeHandler propertyChangeHandler)
         {
             if (data == null)
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs	(.../TruncatedNormalDistributionProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs	(.../TruncatedNormalDistributionProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -20,19 +20,16 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.PropertyClasses
 {
     /// <summary>
-    /// An <see cref="ObjectProperties{T}"/> implementation for <see cref="TruncatedNormalDistribution"/>
-    /// properties.
+    /// Properties class for implementations of <see cref="TruncatedNormalDistribution"/>.
     /// </summary>
     public class TruncatedNormalDistributionProperties : DistributionPropertiesBase<TruncatedNormalDistribution>
     {
@@ -41,7 +38,8 @@
         /// in which the properties of <paramref name="distribution"/> are displayed read-only.
         /// </summary>
         /// <param name="distribution">The <see cref="TruncatedNormalDistribution"/> to create the properties for.</param>
-        public TruncatedNormalDistributionProperties(TruncatedNormalDistribution distribution) : this(DistributionPropertiesReadOnly.All, distribution, null) {}
+        public TruncatedNormalDistributionProperties(TruncatedNormalDistribution distribution)
+            : this(DistributionPropertiesReadOnly.All, distribution, null) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="TruncatedNormalDistributionProperties"/>.
@@ -53,7 +51,10 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="distribution"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Any number of properties in this class is editable and the 
         /// <paramref name="handler"/> is <c>null</c>.</exception>
-        public TruncatedNormalDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, TruncatedNormalDistribution distribution, IObservablePropertyChangeHandler handler) :
+        public TruncatedNormalDistributionProperties(
+            DistributionPropertiesReadOnly propertiesReadOnly,
+            TruncatedNormalDistribution distribution,
+            IObservablePropertyChangeHandler handler) :
             base(propertiesReadOnly, distribution, handler) {}
 
         public override string DistributionType
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs
===================================================================
diff -u -rd5a0bce3d53deb3aef237c365018096e9bc83bb1 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs	(.../VariationCoefficientDistributionPropertiesBase.cs)	(revision d5a0bce3d53deb3aef237c365018096e9bc83bb1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs	(.../VariationCoefficientDistributionPropertiesBase.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -37,7 +37,7 @@
         where TDistribution : IVariationCoefficientDistribution
     {
         private const string meanPropertyName = nameof(Mean);
-        private readonly string variationCoefficientPropertyName = nameof(CoefficientOfVariation);
+        private const string variationCoefficientPropertyName = nameof(CoefficientOfVariation);
         private readonly bool isMeanReadOnly;
         private readonly bool isVariationCoefficientReadOnly;
         private readonly IObservablePropertyChangeHandler changeHandler;
@@ -47,7 +47,7 @@
         /// in which the properties of <paramref name="distribution"/> are displayed read-only.
         /// </summary>
         /// <param name="distribution">The <see cref="TDistribution"/> to create the properties for.</param>
-        public VariationCoefficientDistributionPropertiesBase(TDistribution distribution)
+        protected VariationCoefficientDistributionPropertiesBase(TDistribution distribution)
             : this(VariationCoefficientDistributionPropertiesReadOnly.All, distribution, null) {}
 
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionProperties.cs	(.../VariationCoefficientLogNormalDistributionProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionProperties.cs	(.../VariationCoefficientLogNormalDistributionProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -21,20 +21,19 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.PropertyClasses
 {
     /// <summary>
-    /// An <see cref="ObjectProperties{T}"/> implementation for <see cref="VariationCoefficientLogNormalDistribution"/>.
+    /// Properties class for implementations of <see cref="VariationCoefficientLogNormalDistribution"/>.
     /// </summary>
     public class VariationCoefficientLogNormalDistributionProperties : VariationCoefficientDistributionPropertiesBase<VariationCoefficientLogNormalDistribution>
     {
         /// <summary>
-        /// Creates a new instance of <see cref="NormalDistributionProperties"/>
+        /// Creates a new instance of <see cref="VariationCoefficientLogNormalDistribution"/>
         /// in which the properties of <paramref name="distribution"/> are displayed read-only.
         /// </summary>
         /// <param name="distribution">The <see cref="VariationCoefficientLogNormalDistribution"/> to create the properties for.</param>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientNormalDistributionProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientNormalDistributionProperties.cs	(.../VariationCoefficientNormalDistributionProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientNormalDistributionProperties.cs	(.../VariationCoefficientNormalDistributionProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -21,15 +21,14 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.PropertyClasses
 {
     /// <summary>
-    /// An <see cref="ObjectProperties{T}"/> implementation for <see cref="VariationCoefficientNormalDistribution"/>.
+    /// Properties class for implementations of <see cref="VariationCoefficientNormalDistribution"/>.
     /// </summary>
     public class VariationCoefficientNormalDistributionProperties : VariationCoefficientDistributionPropertiesBase<VariationCoefficientNormalDistribution>
     {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -303,6 +303,8 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsStructure_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -311,7 +313,6 @@
                     hydraulicBoundaryLocation
                 }
             };
-            mockRepository.ReplayAll();
 
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
@@ -395,6 +396,8 @@
         public void GivenPropertiesWithStructureAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
             // Given
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -403,7 +406,6 @@
                     hydraulicBoundaryLocation
                 }
             };
-            mockRepository.ReplayAll();
 
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
@@ -440,6 +442,8 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsAndNoStructure_ReturnsLocationsSortedById()
         {
             // Setup
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -452,8 +456,6 @@
             };
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            mockRepository.ReplayAll();
-
             var calculation = new StructuresCalculation<SimpleStructureInput>();
             var inputContext = new SimpleInputContext(calculation.InputParameters,
                                                       calculation,
@@ -480,6 +482,8 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsAndStructure_ReturnsLocationsSortByDistanceThenById()
         {
             // Setup
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -494,8 +498,6 @@
             };
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            mockRepository.ReplayAll();
-
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
                 InputParameters =
@@ -531,6 +533,8 @@
         public void GivenLocationAndReferencePoint_WhenUpdatingStructure_ThenUpdateSelectableBoundaryLocations()
         {
             // Given
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -544,7 +548,6 @@
                 }
             };
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-            mockRepository.ReplayAll();
 
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
@@ -768,7 +771,9 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            var customHandler = CreateCustomHandlerForCalculationReturningNoObservables<SimpleStructure>(calculation, null);
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+                CreateCustomHandlerForCalculationReturningNoObservables<SimpleStructure>(calculation, null);
+
             var properties = new SimpleStructuresInputProperties(
                 inputContext,
                 new StructuresInputBaseProperties<SimpleStructure, SimpleStructureInput, StructuresCalculation<SimpleStructureInput>, IFailureMechanism>.ConstructionProperties(),
@@ -797,7 +802,9 @@
                                                       assessmentSection);
 
             var newStructure = new SimpleStructure();
-            var customHandler = CreateCustomHandlerForCalculationReturningNoObservables(calculation, newStructure);
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+                CreateCustomHandlerForCalculationReturningNoObservables(calculation, newStructure);
+
             var properties = new SimpleStructuresInputProperties(
                 inputContext,
                 new StructuresInputBaseProperties<SimpleStructure, SimpleStructureInput, StructuresCalculation<SimpleStructureInput>, IFailureMechanism>.ConstructionProperties(),
@@ -828,7 +835,7 @@
                                                       assessmentSection);
 
             string newStringValue = newValue.ToString(CultureInfo.InvariantCulture);
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler = 
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables(calculation, newStringValue);
 
             var properties = new SimpleStructuresInputProperties(
@@ -860,7 +867,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler = 
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables(calculation, newValue);
 
             var properties = new SimpleStructuresInputProperties(
@@ -890,7 +897,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler = 
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables<string>(calculation, null);
 
             var properties = new SimpleStructuresInputProperties(
@@ -1035,9 +1042,9 @@
             input.ForeshoreProfile = new TestForeshoreProfile();
 
             var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
-                {
-                    observable
-                });
+            {
+                observable
+            });
 
             var inputContext = new SimpleInputContext(input,
                                                       calculation,
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs	(.../TruncatedNormalDistributionPropertiesTest.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs	(.../TruncatedNormalDistributionPropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -21,7 +21,6 @@
 
 using System;
 using System.ComponentModel;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -221,7 +221,7 @@
                                                                     new TestUseBreakWater());
         }
 
-        public class TestUseBreakWater : Observable, ICalculationInput, IUseBreakWater
+        private class TestUseBreakWater : Observable, ICalculationInput, IUseBreakWater
         {
             public TestUseBreakWater()
             {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseForeshorePropertiesTest.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseForeshorePropertiesTest.cs	(.../UseForeshorePropertiesTest.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseForeshorePropertiesTest.cs	(.../UseForeshorePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -208,7 +208,7 @@
             mocks.VerifyAll();
         }
 
-        public class TestUseForeshore : Observable, ICalculationInput, IUseForeshore
+        private class TestUseForeshore : Observable, ICalculationInput, IUseForeshore
         {
             public bool UseForeshore { get; set; }
             public RoundedPoint2DCollection ForeshoreGeometry { get; set; }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs
===================================================================
diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs	(.../CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs)	(revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs	(.../CalculationInputSetPropertyValueAfterConfirmationParameterTesterTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
@@ -34,7 +35,7 @@
         public void Constructructed_Always_PropertiesSet()
         {
             // Setup
-            var returnedAffectedObjects = Enumerable.Empty<IObservable>();
+            IEnumerable<IObservable> returnedAffectedObjects = Enumerable.Empty<IObservable>();
 
             // Call
             var tester = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
@@ -49,13 +50,13 @@
         public void SetPropertyValueAfterConfirmation_ParametersAreSameAndEqual_SetValueCalledReturnsGivenAffectedObjects()
         {
             // Setup
-            var returnedAffectedObjects = Enumerable.Empty<IObservable>();
+            IEnumerable<IObservable> returnedAffectedObjects = Enumerable.Empty<IObservable>();
             var called = 0;
 
             var tester = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
 
             // Call
-            var affectedObjects = tester.SetPropertyValueAfterConfirmation(() => called++);
+            IEnumerable<IObservable> affectedObjects = tester.SetPropertyValueAfterConfirmation(() => called++);
 
             // Assert
             Assert.AreEqual(1, called);
@@ -67,9 +68,9 @@
         public void SetPropertyValueAfterConfirmation_SetValueThrowsException_BubblesException()
         {
             // Setup
-            var returnedAffectedObjects = Enumerable.Empty<IObservable>();
+            IEnumerable<IObservable> returnedAffectedObjects = Enumerable.Empty<IObservable>();
 
-             var tester = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
+            var tester = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(returnedAffectedObjects);
 
             var expectedException = new Exception();
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs	(.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs	(.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -26,7 +26,6 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/DesignVariableProperties.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/DesignVariableProperties.cs	(.../DesignVariableProperties.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/DesignVariableProperties.cs	(.../DesignVariableProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -25,7 +25,6 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -35,24 +34,20 @@
     /// ViewModel base of <see cref="DesignVariable{TDistribution}"/> for properties panel.
     /// </summary>
     /// <typeparam name="TDistribution">The type of the distribution.</typeparam>
-    public abstract class DesignVariableProperties<TDistribution> 
+    public abstract class DesignVariableProperties<TDistribution>
         : DistributionPropertiesBase<TDistribution>
         where TDistribution : IDistribution
     {
         /// <summary>
-        /// Creates a new <see cref="DesignVariableProperties{TDistribution}"/>
+        /// Creates a new <see cref="DesignVariableProperties{TDistribution}"/>.
         /// </summary>
         /// <param name="propertiesReadOnly">Indicates which properties, if any, should be marked as read-only.</param>
         /// <param name="designVariable">The data of the <see cref="TDistribution"/> to create the properties for.</param>
-        /// <param name="calculation">The calculation the <paramref name="designVariable"/> belongs to.</param>
-        /// <param name="propertyOwner">The calculation input the <paramref name="designVariable"/> belongs to.</param>
         /// <param name="handler">The handler responsible for handling effects of a property change.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="designVariable"/> is <c>null</c>
         /// or when any number of properties in this class is editable and any other parameter is <c>null</c>.</exception>
         protected DesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly,
                                            DesignVariable<TDistribution> designVariable,
-                                           PipingCalculationScenario calculation,
-                                           PipingInput propertyOwner,
                                            IObservablePropertyChangeHandler handler)
             : base(propertiesReadOnly, GetDistribution(designVariable), handler)
         {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs
===================================================================
diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs	(.../LogNormalDistributionDesignVariableProperties.cs)	(revision b41ef82a44c84f0211937d1b7f22794ad8a45941)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs	(.../LogNormalDistributionDesignVariableProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -24,7 +24,6 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.PropertyClasses
@@ -40,27 +39,21 @@
         /// <param name="designVariable">The <see cref="DesignVariable{T}"/> to create the properties for.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="designVariable"/> is <c>null</c>.</exception>
         public LogNormalDistributionDesignVariableProperties(DesignVariable<LogNormalDistribution> designVariable)
-            : this(DistributionPropertiesReadOnly.All, designVariable, null, null, null) {}
+            : this(DistributionPropertiesReadOnly.All, designVariable, null) {}
 
         /// <summary>
         /// Creates a new <see cref="LogNormalDistributionDesignVariableProperties"/>.
         /// </summary>
         /// <param name="propertiesReadOnly">Indicates which properties, if any, should be marked as read-only.</param>
         /// <param name="designVariable">The <see cref="DesignVariable{T}"/> to create the properties for.</param>
-        /// <param name="calculation">The calculation the <paramref name="designVariable"/> belongs to.</param>
-        /// <param name="propertyOwner">The calculation input the <paramref name="designVariable"/> belongs to.</param>
         /// <param name="handler">The handler responsible for handling effects of a property change.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="designVariable"/> is <c>null</c>
         /// or when any number of properties in this class is editable and any other parameter is <c>null</c>.</exception>
         public LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly,
                                                              DesignVariable<LogNormalDistribution> designVariable,
-                                                             PipingCalculationScenario calculation,
-                                                             PipingInput propertyOwner,
                                                              IObservablePropertyChangeHandler handler)
             : base(propertiesReadOnly,
                    designVariable,
-                   calculation,
-                   propertyOwner,
                    handler) {}
 
         public override string DistributionType { get; } = RingtoetsCommonFormsResources.DistributionType_LogNormal;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs
===================================================================
diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs	(.../NormalDistributionDesignVariableProperties.cs)	(revision b41ef82a44c84f0211937d1b7f22794ad8a45941)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs	(.../NormalDistributionDesignVariableProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -24,7 +24,6 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.PropertyClasses
@@ -39,20 +38,14 @@
         /// </summary>
         /// <param name="propertiesReadOnly">Indicates which properties, if any, should be marked as read-only.</param>
         /// <param name="designVariable">The <see cref="DesignVariable{T}"/> to create the properties for.</param>
-        /// <param name="calculation">The calculation the <paramref name="designVariable"/> belongs to.</param>
-        /// <param name="propertyOwner">The calculation input the <paramref name="designVariable"/> belongs to.</param>
         /// <param name="handler">The handler responsible for handling effects of a property change.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="designVariable"/> is <c>null</c>
         /// or when any number of properties in this class is editable and any other parameter is <c>null</c>.</exception>
         public NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly,
                                                           DesignVariable<NormalDistribution> designVariable,
-                                                          PipingCalculationScenario calculation,
-                                                          PipingInput propertyOwner,
                                                           IObservablePropertyChangeHandler handler)
             : base(propertiesReadOnly,
                    designVariable,
-                   calculation,
-                   propertyOwner,
                    handler) {}
 
         public override string DistributionType { get; } = RingtoetsCommonFormsResources.DistributionType_Normal;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -rd5a0bce3d53deb3aef237c365018096e9bc83bb1 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision d5a0bce3d53deb3aef237c365018096e9bc83bb1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing.Design;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Gui.Attributes;
@@ -223,8 +222,6 @@
             {
                 return new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                          PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedData),
-                                                                         data.PipingCalculation,
-                                                                         data.WrappedData,
                                                                          propertyChangeHandler);
             }
         }
@@ -240,8 +237,6 @@
             {
                 return new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                       PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(data.WrappedData),
-                                                                      data.PipingCalculation,
-                                                                      data.WrappedData,
                                                                       propertyChangeHandler);
             }
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs
===================================================================
diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs	(.../ShiftedLogNormalDistributionDesignVariableProperties.cs)	(revision b41ef82a44c84f0211937d1b7f22794ad8a45941)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs	(.../ShiftedLogNormalDistributionDesignVariableProperties.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -25,7 +25,6 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -50,17 +49,13 @@
         /// </summary>
         /// <param name="propertiesReadOnly">Indicates which properties, if any, should be marked as read-only.</param>
         /// <param name="designVariable">The <see cref="DesignVariable{T}"/> to create the properties for.</param>
-        /// <param name="calculation">The calculation the <paramref name="designVariable"/> belongs to.</param>
-        /// <param name="propertyOwner">The calculation input the <paramref name="designVariable"/> belongs to.</param>
         /// <param name="handler">The handler responsible for handling effects of a property change.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="designVariable"/> is <c>null</c>
         /// or when any number of properties in this class is editable and any other parameter is <c>null</c>.</exception>
         public ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly,
                                                                     DesignVariable<LogNormalDistribution> designVariable,
-                                                                    PipingCalculationScenario calculation,
-                                                                    PipingInput propertyOwner,
                                                                     IObservablePropertyChangeHandler handler)
-            : base(propertiesReadOnly, designVariable, calculation, propertyOwner, handler) {}
+            : base(propertiesReadOnly, designVariable, handler) {}
 
         [PropertyOrder(4)]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.Probabilistics_Shift_Symbol))]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs	(.../DesignVariablePropertiesTest.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs	(.../DesignVariablePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -47,8 +47,6 @@
             // Call
             TestDelegate test = () => new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                          null,
-                                                                         calculation,
-                                                                         calculation.InputParameters,
                                                                          handler);
 
             // Assert
@@ -73,8 +71,6 @@
             // Call
             var properties = new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.All,
                                                                 designVariable,
-                                                                calculationScenario,
-                                                                calculationScenario.InputParameters,
                                                                 handler);
 
             // Assert
@@ -104,8 +100,6 @@
             // Call
             var properties = new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                 designVariable,
-                                                                calculationScenario,
-                                                                calculationScenario.InputParameters,
                                                                 handler);
 
             // Call
@@ -119,10 +113,8 @@
         {
             public SimpleDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly,
                                                   DesignVariable<LogNormalDistribution> designVariable,
-                                                  PipingCalculationScenario calculation,
-                                                  PipingInput propertyOwner,
                                                   IObservablePropertyChangeHandler handler)
-                : base(propertiesReadOnly, designVariable, calculation, propertyOwner, handler) {}
+                : base(propertiesReadOnly, designVariable, handler) {}
 
             public override string DistributionType { get; }
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs
===================================================================
diff -u -r277048d204ab4cfad4aa5de4d57ef38b56642c25 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs	(.../LogNormalDistributionDesignVariablePropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs	(.../LogNormalDistributionDesignVariablePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -27,8 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PropertyClasses;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
@@ -73,13 +71,9 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             TestDelegate test = () => new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                         null,
-                                                                                        calculation,
-                                                                                        calculation.InputParameters,
                                                                                         handler);
 
             // Assert
@@ -99,13 +93,9 @@
             var distribution = new LogNormalDistribution();
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All,
                                                               designVariable,
-                                                              calculationScenario,
-                                                              calculationScenario.InputParameters,
                                                               handler);
 
             // Assert
@@ -128,13 +118,9 @@
             var distribution = new LogNormalDistribution();
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                designVariable,
-                                                                               calculationScenario,
-                                                                               calculationScenario.InputParameters,
                                                                                handler);
 
             // Assert
@@ -184,13 +170,9 @@
             };
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                designVariable,
-                                                                               calculationScenario,
-                                                                               calculationScenario.InputParameters,
                                                                                handler);
 
             // Assert
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs
===================================================================
diff -u -r277048d204ab4cfad4aa5de4d57ef38b56642c25 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs	(.../NormalDistributionDesignVariablePropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs	(.../NormalDistributionDesignVariablePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -27,8 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PropertyClasses;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
@@ -44,13 +42,9 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             TestDelegate test = () => new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                      null,
-                                                                                     calculation,
-                                                                                     calculation.InputParameters,
                                                                                      handler);
 
             // Assert
@@ -70,13 +64,9 @@
             var distribution = new NormalDistribution();
             var designVariable = new NormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All,
                                                                             designVariable,
-                                                                            calculationScenario,
-                                                                            calculationScenario.InputParameters,
                                                                             handler);
 
             // Assert
@@ -99,13 +89,9 @@
             var distribution = new NormalDistribution();
             var designVariable = new NormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                             designVariable,
-                                                                            calculationScenario,
-                                                                            calculationScenario.InputParameters,
                                                                             handler);
 
             // Assert
@@ -155,13 +141,9 @@
             };
             var designVariable = new NormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                             designVariable,
-                                                                            calculationScenario,
-                                                                            calculationScenario.InputParameters,
                                                                             handler);
 
             // Assert
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs
===================================================================
diff -u -r277048d204ab4cfad4aa5de4d57ef38b56642c25 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs	(.../ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs	(.../ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -27,8 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PropertyClasses;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
@@ -73,13 +71,9 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             TestDelegate test = () => new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                         null,
-                                                                                        calculation,
-                                                                                        calculation.InputParameters,
                                                                                         handler);
 
             // Assert
@@ -99,13 +93,9 @@
             var distribution = new LogNormalDistribution();
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All,
                                                               designVariable,
-                                                              calculationScenario,
-                                                              calculationScenario.InputParameters,
                                                               handler);
 
             // Assert
@@ -128,13 +118,9 @@
             var distribution = new LogNormalDistribution();
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                designVariable,
-                                                                               calculationScenario,
-                                                                               calculationScenario.InputParameters,
                                                                                handler);
 
             // Assert
@@ -191,13 +177,9 @@
             };
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                designVariable,
-                                                                               calculationScenario,
-                                                                               calculationScenario.InputParameters,
                                                                                handler);
 
             // Assert
@@ -224,13 +206,9 @@
             };
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
-            PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
-
             // Call
             var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,
                                                                                designVariable,
-                                                                               calculationScenario,
-                                                                               calculationScenario.InputParameters,
                                                                                handler);
 
             // Call
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r277048d204ab4cfad4aa5de4d57ef38b56642c25 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -25,7 +25,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Forms.ChangeHandlers;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Revetment.Data;
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r277048d204ab4cfad4aa5de4d57ef38b56642c25 -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 277048d204ab4cfad4aa5de4d57ef38b56642c25)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -25,7 +25,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Forms.ChangeHandlers;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Revetment.Data;