Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r20bb156dfc129b1602ddbcddc73c0806807f19ab -rdaa1008263412accdb1fcad949ddf100fb2e97b7
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs	(.../StandAloneFailureMechanismContextPropertiesTest.cs)	(revision 20bb156dfc129b1602ddbcddc73c0806807f19ab)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs	(.../StandAloneFailureMechanismContextPropertiesTest.cs)	(revision daa1008263412accdb1fcad949ddf100fb2e97b7)
@@ -23,7 +23,9 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -41,14 +43,14 @@
             var properties = new StandAloneFailureMechanismContextProperties();
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<SimpleFailureMechanismContext>>(properties);
+            Assert.IsInstanceOf<ObjectProperties<FailureMechanismContext<IFailureMechanism>>>(properties);
         }
 
         [Test]
-        public void Data_SetNewStandAloneFailureMechanismContextInstance_ReturnCorrectPropertyValues()
+        public void Data_SetNewSimpleFailureMechanismContextInstance_ReturnCorrectPropertyValues()
         {
             // Setup
-            var failureMechanism = new MacrostabilityInwardsFailureMechanism();
+            var failureMechanism = new TestFailureMechanism();
             var properties = new StandAloneFailureMechanismContextProperties();
 
             // Call
@@ -58,5 +60,20 @@
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
         } 
+
+        [Test]
+        public void Data_SetNewCustomFailureMechanismContextInstance_ReturnCorrectPropertyValues()
+        {
+            // Setup
+            var failureMechanism = new TestFailureMechanism();
+            var properties = new StandAloneFailureMechanismContextProperties();
+
+            // Call
+            properties.Data = new CustomFailureMechanismContext(failureMechanism, new MockRepository().StrictMock<IAssessmentSection>());
+
+            // Assert
+            Assert.AreEqual(failureMechanism.Name, properties.Name);
+            Assert.AreEqual(failureMechanism.Code, properties.Code);
+        } 
     }
 }
\ No newline at end of file