Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs
===================================================================
diff -u -r90b2d218ebb44b9ffaeba59402c865fe144d94ae -r847e469cc410a51f4a3e582862ebc3658e67f46f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs)	(revision 90b2d218ebb44b9ffaeba59402c865fe144d94ae)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs)	(revision 847e469cc410a51f4a3e582862ebc3658e67f46f)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 
@@ -52,29 +53,17 @@
         private const int shouldCalculateIllustrationPointsIndex = 9;
 
         [Test]
-        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(new TestHydraulicBoundaryLocation(), null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties>(properties);
-            Assert.AreSame(hydraulicBoundaryLocation, properties.Data);
+            Assert.IsInstanceOf<HydraulicBoundaryLocationProperties>(properties);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Data);
         }
 
         [Test]
@@ -85,7 +74,7 @@
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.AreEqual(hydraulicBoundaryLocation.Id, properties.Id);
@@ -160,7 +149,7 @@
             };
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.AreEqual(id, properties.Id);
@@ -195,7 +184,7 @@
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
             TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
@@ -276,35 +265,5 @@
                                                                             "Illustratiepunten inlezen",
                                                                             "Neem de informatie over de illustratiepunten op in het berekeningsresultaat.");
         }
-
-        [Test]
-        public void ShouldIllustrationPointsBeCalculated_SetNewValue_NotifyObservers()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-            mocks.ReplayAll();
-
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
-            {
-                InputParameters =
-                {
-                    ShouldIllustrationPointsBeCalculated = false
-                }
-            };
-
-            hydraulicBoundaryLocation.Attach(observer);
-
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
-
-            // Call
-            properties.ShouldIllustrationPointsBeCalculated = true;
-
-            // Assert
-            Assert.IsTrue(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-            mocks.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs
===================================================================
diff -u -r90b2d218ebb44b9ffaeba59402c865fe144d94ae -r847e469cc410a51f4a3e582862ebc3658e67f46f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs)	(revision 90b2d218ebb44b9ffaeba59402c865fe144d94ae)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs)	(revision 847e469cc410a51f4a3e582862ebc3658e67f46f)
@@ -22,16 +22,15 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Common.Util;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 
@@ -52,29 +51,17 @@
         private const int shouldCalculateIllustrationPointsIndex = 9;
 
         [Test]
-        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => new GrassCoverErosionOutwardsWaveHeightLocationProperties(new TestHydraulicBoundaryLocation(), null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<GrassCoverErosionOutwardsHydraulicBoundaryLocationProperties>(properties);
-            Assert.AreSame(hydraulicBoundaryLocation, properties.Data);
+            Assert.IsInstanceOf<HydraulicBoundaryLocationProperties>(properties);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Data);
         }
 
         [Test]
@@ -85,7 +72,7 @@
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.AreEqual(hydraulicBoundaryLocation.Id, properties.Id);
@@ -160,7 +147,7 @@
             };
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.AreEqual(id, properties.Id);
@@ -195,7 +182,7 @@
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
             TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
@@ -276,35 +263,5 @@
                                                                             "Illustratiepunten inlezen",
                                                                             "Neem de informatie over de illustratiepunten op in het berekeningsresultaat.");
         }
-
-        [Test]
-        public void ShouldIllustrationPointsBeCalculated_SetNewValue_NotifyObservers()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-            mocks.ReplayAll();
-
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
-            {
-                InputParameters =
-                {
-                    ShouldIllustrationPointsBeCalculated = false
-                }
-            };
-
-            hydraulicBoundaryLocation.Attach(observer);
-
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
-
-            // Call
-            properties.ShouldIllustrationPointsBeCalculated = true;
-
-            // Assert
-            Assert.IsTrue(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-            mocks.VerifyAll();
-        }
     }
 }
\ No newline at end of file