Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r4f7e946d92b75c914f2072cfddb5b2a1534290f3 -ra655ba1960f4a477af6296986b583c6800373f54
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs	(.../DuneErosionFailureMechanismPropertiesTest.cs)	(revision 4f7e946d92b75c914f2072cfddb5b2a1534290f3)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs	(.../DuneErosionFailureMechanismPropertiesTest.cs)	(revision a655ba1960f4a477af6296986b583c6800373f54)
@@ -49,14 +49,51 @@
             var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<DuneErosionFailureMechanism>>();
             mocks.ReplayAll();
 
+            var failureMechanism = new DuneErosionFailureMechanism();
+
             // Call
-            var properties = new DuneErosionFailureMechanismProperties(null, changeHandler);
+            var properties = new DuneErosionFailureMechanismProperties(failureMechanism, changeHandler);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<DuneErosionFailureMechanism>>(properties);
+            Assert.AreSame(failureMechanism, properties.Data);
+            mocks.VerifyAll();
         }
 
+
         [Test]
+        public void Constructor_DataIsNull_ThrownArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<DuneErosionFailureMechanism>>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new DuneErosionFailureMechanismProperties(null, changeHandler);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("data", paramName);
+            mocks.VerifyAll();
+        }
+
+
+        [Test]
+        public void Constructor_PropertyChangeHandlerNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new DuneErosionFailureMechanism();
+
+            // Call
+            TestDelegate call = () => new DuneErosionFailureMechanismProperties(failureMechanism, null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("propertyChangeHandler", paramName);
+        }
+
+        [Test]
         public void Constructor_Always_PropertiesHaveExpectedAttributeValues()
         {
             // Setup
@@ -106,9 +143,17 @@
             var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<DuneErosionFailureMechanism>>();
             mocks.ReplayAll();
 
+            var originalFailureMechanism = new DuneErosionFailureMechanism
+            {
+                GeneralInput =
+                {
+                    N = (RoundedDouble)1.1
+                }
+            };
+
             var failureMechanism = new DuneErosionFailureMechanism();
 
-            var properties = new DuneErosionFailureMechanismProperties(null, changeHandler);
+            var properties = new DuneErosionFailureMechanismProperties(originalFailureMechanism, changeHandler);
 
             // Call
             properties.Data = failureMechanism;
@@ -117,6 +162,7 @@
             Assert.AreEqual("Duinwaterkering - Duinafslag", properties.Name);
             Assert.AreEqual("DA", properties.Code);
             Assert.AreEqual(failureMechanism.GeneralInput.N, properties.LengthEffect);
+            mocks.VerifyAll();
         }
 
         [Test]