Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r9a001397536d9dcca5d009c8518478cdfcddbeca
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs)	(revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs)	(revision 9a001397536d9dcca5d009c8518478cdfcddbeca)
@@ -20,12 +20,13 @@
 // All rights reserved.
 
 using System.ComponentModel;
+using System.Linq;
 using Core.Common.Base;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Data.Properties;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -54,27 +55,18 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
-            // Call
-            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties();
-
-            // Assert
-            Assert.IsInstanceOf<ObjectProperties<GrassCoverErosionInwardsFailureMechanismContext>>(properties);
-            Assert.IsNull(properties.Data);
-        }
-
-        [Test]
-        public void Data_SetNewFailureMechanismContextInstance_ReturnCorrectPropertyValues()
-        {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var handler = CreateSimpleHandler();
+
             mockRepository.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties();
+            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(
+                new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock),
+                handler
+            );
 
-            // Call
-            properties.Data = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock);
-
             // Assert
             Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayName, properties.Name);
             Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode, properties.Code);
@@ -100,17 +92,18 @@
         {
             // Setup
             var observerMock = mockRepository.StrictMock<IObserver>();
+            var handler = CreateSimpleHandler();
             int numberOfChangedProperties = 1;
             observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties);
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             failureMechanism.Attach(observerMock);
-            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties
-            {
-                Data = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock)
-            };
+            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(
+                new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock),
+                handler
+            );
             const int newLengthEffect = 10;
 
             // Call
@@ -126,15 +119,16 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var handler = CreateSimpleHandler();
             mockRepository.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             // Call
-            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties
-            {
-                Data = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock)
-            };
+            var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(
+                new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock),
+                handler
+            );
 
             // Assert
             var generalCategory = "Algemeen";
@@ -198,5 +192,14 @@
 
             mockRepository.VerifyAll();
         }
+
+        private IFailureMechanismPropertyChangeHandler CreateSimpleHandler()
+        {
+            var handler = mockRepository.Stub<IFailureMechanismPropertyChangeHandler>();
+            handler.Stub(h => h.ConfirmPropertyChange()).Return(true);
+            handler.Stub(h => h.PropertyChanged(Arg<GrassCoverErosionInwardsFailureMechanism>.Matches(z => true))).Return(Enumerable.Empty<IObservable>());
+
+            return handler;
+        }
     }
 }
\ No newline at end of file