Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -r99682715ec2d5d4ff391b5b0c1478a75f9019c65 -rf929dfc072b392b419cd952e527d234ea79890e4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 99682715ec2d5d4ff391b5b0c1478a75f9019c65)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision f929dfc072b392b419cd952e527d234ea79890e4)
@@ -78,7 +78,7 @@
 
                 // When
                 assessmentSection.ChangeComposition(newComposition);
-                assessmentSection.FailureMechanismContribution.NotifyObservers();
+                assessmentSection.NotifyObservers();
 
                 // Then
                 var compositionLabel = (Label) new ControlTester(assessmentSectionCompositionLabelName).TheObject;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs
===================================================================
diff -u -r99682715ec2d5d4ff391b5b0c1478a75f9019c65 -rf929dfc072b392b419cd952e527d234ea79890e4
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs	(.../FailureMechanismContributionViewInfoTest.cs)	(revision 99682715ec2d5d4ff391b5b0c1478a75f9019c65)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs	(.../FailureMechanismContributionViewInfoTest.cs)	(revision f929dfc072b392b419cd952e527d234ea79890e4)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Drawing;
 using System.Linq;
 using Core.Common.Gui;
@@ -69,36 +68,14 @@
         }
 
         [Test]
-        public void ViewDataType_Always_ReturnsViewDataType()
+        public void Initialized_Always_ExpectedPropertiesSet()
         {
-            // Call
-            Type viewDataType = info.ViewDataType;
-
             // Assert
-            Assert.AreEqual(typeof(FailureMechanismContribution), viewDataType);
+            Assert.AreEqual(typeof(FailureMechanismContributionContext), info.DataType);
+            Assert.AreEqual(typeof(FailureMechanismContribution), info.ViewDataType);
         }
 
         [Test]
-        public void ViewType_Always_ReturnsViewType()
-        {
-            // Call
-            Type viewType = info.ViewType;
-
-            // Assert
-            Assert.AreEqual(typeof(FailureMechanismContributionView), viewType);
-        }
-
-        [Test]
-        public void DataType_Always_ReturnsDataType()
-        {
-            // Call
-            Type dataType = info.DataType;
-
-            // Assert
-            Assert.AreEqual(typeof(FailureMechanismContributionContext), dataType);
-        }
-
-        [Test]
         public void Image_Always_ReturnsGenericInputOutputIcon()
         {
             // Call
@@ -109,7 +86,7 @@
         }
 
         [Test]
-        public void GetViewData_Always_Returns_FailureMechanismContribution()
+        public void GetViewData_Always_ReturnsFailureMechanismContribution()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks);
@@ -131,9 +108,9 @@
             // Setup
             var viewCommands = mocks.Stub<IViewCommands>();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks);
-            assessmentSection.Stub(section => section.Composition)
-                             .Return(AssessmentSectionComposition.Dike);
-
+            assessmentSection.Stub(section => section.Composition).Return(AssessmentSectionComposition.Dike);
+            assessmentSection.Stub(section => section.Attach(null)).IgnoreArguments();
+            assessmentSection.Stub(section => section.Detach(null)).IgnoreArguments();
             mocks.ReplayAll();
 
             using (var view = new FailureMechanismContributionView(assessmentSection, viewCommands))
@@ -155,12 +132,12 @@
             var viewCommands = mocks.Stub<IViewCommands>();
 
             IAssessmentSection assessmentSection1 = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks);
-            assessmentSection1.Stub(section => section.Composition)
-                              .Return(AssessmentSectionComposition.DikeAndDune);
+            assessmentSection1.Stub(section => section.Composition).Return(AssessmentSectionComposition.DikeAndDune);
+            assessmentSection1.Stub(section => section.Attach(null)).IgnoreArguments();
+            assessmentSection1.Stub(section => section.Detach(null)).IgnoreArguments();
 
             IAssessmentSection assessmentSection2 = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks);
-            assessmentSection2.Stub(section => section.Composition)
-                              .Return(AssessmentSectionComposition.DikeAndDune);
+            assessmentSection2.Stub(section => section.Composition).Return(AssessmentSectionComposition.DikeAndDune);
             mocks.ReplayAll();
 
             using (var view = new FailureMechanismContributionView(assessmentSection1, viewCommands))
@@ -176,36 +153,29 @@
         }
 
         [Test]
-        public void AfterCreate_WithGuiSet_SetsAssessmentSection()
+        public void CreateInstance_WithContext_SetsExpectedViewProperties()
         {
             // Setup
-            var viewCommands = mocks.Stub<IViewCommands>();
-
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks);
             assessmentSection.Stub(section => section.Composition).Return(AssessmentSectionComposition.Dike);
+            assessmentSection.Stub(section => section.Attach(null)).IgnoreArguments();
+            assessmentSection.Stub(section => section.Detach(null)).IgnoreArguments();
 
             var gui = mocks.Stub<IGui>();
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-
+            gui.Stub(g => g.ViewCommands).Return(mocks.Stub<IViewCommands>());
             mocks.ReplayAll();
 
+            plugin.Gui = gui;
+
             var context = new FailureMechanismContributionContext(assessmentSection.FailureMechanismContribution, assessmentSection);
 
-            using (var view = new FailureMechanismContributionView(assessmentSection, viewCommands))
-            using (var ringtoetsPlugin = new RingtoetsPlugin())
-            {
-                info = ringtoetsPlugin.GetViewInfos().First(tni => tni.ViewType == typeof(FailureMechanismContributionView));
-                ringtoetsPlugin.Gui = gui;
+            // Call
+            var view = (FailureMechanismContributionView) info.CreateInstance(context);
 
-                // Call
-                info.AfterCreate(view, context);
-
-                // Assert
-                Assert.AreSame(view.AssessmentSection, assessmentSection);
-            }
-
-            mocks.VerifyAll();
+            // Assert
+            Assert.AreSame(assessmentSection, view.AssessmentSection);
         }
     }
 }
\ No newline at end of file