Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -r18c24ff9abe1486f5a801cd2fee04a04279ead3f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs	(.../MacroStabilityInwardsFailureMechanismResultView.cs)	(revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs	(.../MacroStabilityInwardsFailureMechanismResultView.cs)	(revision 18c24ff9abe1486f5a801cd2fee04a04279ead3f)
@@ -42,16 +42,19 @@
         private readonly RecursiveObserver<CalculationGroup, ICalculationInput> calculationInputObserver;
         private readonly RecursiveObserver<CalculationGroup, ICalculationOutput> calculationOutputObserver;
         private readonly RecursiveObserver<CalculationGroup, ICalculationBase> calculationGroupObserver;
+        private readonly Observer failureMechanismObserver;
         private readonly IAssessmentSection assessmentSection;
 
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsFailureMechanismResultView"/>.
         /// </summary>
         /// <param name="assessmentSection">The assessment section that the failure mechanism belongs to.</param>
+        /// <param name="failureMechanism">The failure mechanism this view belongs to.</param>
         /// <param name="failureMechanismSectionResults">The collection of failure mechanism section results.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public MacroStabilityInwardsFailureMechanismResultView(
             IAssessmentSection assessmentSection,
+            MacroStabilityInwardsFailureMechanism failureMechanism,
             IObservableEnumerable<MacroStabilityInwardsFailureMechanismSectionResult> failureMechanismSectionResults)
             : base(failureMechanismSectionResults)
         {
@@ -60,6 +63,17 @@
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
 
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanism));
+            }
+
+            FailureMechanism = failureMechanism;
+            failureMechanismObserver = new Observer(UpdateDataGridViewDataSource)
+            {
+                Observable = failureMechanism
+            };
+
             this.assessmentSection = assessmentSection;
 
             DataGridViewControl.CellFormatting += ShowAssessmentLayerTwoAErrors;
@@ -79,23 +93,21 @@
             calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
                 UpdateDataGridViewDataSource,
                 c => c.Children);
-        }
 
-        public override IFailureMechanism FailureMechanism
-        {
-            set
-            {
-                base.FailureMechanism = value;
+            CalculationGroup observableGroup = failureMechanism.CalculationsGroup;
 
-                var calculatableFailureMechanism = value as ICalculatableFailureMechanism;
-                CalculationGroup observableGroup = calculatableFailureMechanism?.CalculationsGroup;
+            calculationInputObserver.Observable = observableGroup;
+            calculationOutputObserver.Observable = observableGroup;
+            calculationGroupObserver.Observable = observableGroup;
 
-                calculationInputObserver.Observable = observableGroup;
-                calculationOutputObserver.Observable = observableGroup;
-                calculationGroupObserver.Observable = observableGroup;
-            }
+            UpdateDataGridViewDataSource();
         }
 
+        /// <summary>
+        /// Gets the macro stability inwards failure mechanism.
+        /// </summary>
+        public MacroStabilityInwardsFailureMechanism FailureMechanism { get; }
+
         protected override void Dispose(bool disposing)
         {
             DataGridViewControl.CellFormatting -= ShowAssessmentLayerTwoAErrors;
@@ -104,20 +116,16 @@
             calculationInputObserver.Dispose();
             calculationOutputObserver.Dispose();
             calculationGroupObserver.Dispose();
+            failureMechanismObserver.Dispose();
 
             base.Dispose(disposing);
         }
 
         protected override object CreateFailureMechanismSectionResultRow(MacroStabilityInwardsFailureMechanismSectionResult sectionResult)
         {
-            if (FailureMechanism == null)
-            {
-                return null;
-            }
-
             return new MacroStabilityInwardsFailureMechanismSectionResultRow(sectionResult,
                                                                              FailureMechanism.Calculations.OfType<MacroStabilityInwardsCalculationScenario>(),
-                                                                             (MacroStabilityInwardsFailureMechanism) FailureMechanism, assessmentSection);
+                                                                             FailureMechanism, assessmentSection);
         }
 
         protected override void AddDataGridColumns()
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -rf603458169b1e2544bc933b05f169cc1637d59b2 -r18c24ff9abe1486f5a801cd2fee04a04279ead3f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision f603458169b1e2544bc933b05f169cc1637d59b2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 18c24ff9abe1486f5a801cd2fee04a04279ead3f)
@@ -221,9 +221,9 @@
                 Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon,
                 CloseForData = CloseFailureMechanismResultViewForData,
                 GetViewData = context => context.WrappedData,
-                AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism,
                 CreateInstance = context => new MacroStabilityInwardsFailureMechanismResultView(
                     context.AssessmentSection,
+                    (MacroStabilityInwardsFailureMechanism) context.FailureMechanism,
                     context.WrappedData)
             };
 
@@ -432,15 +432,15 @@
                 return assessmentSection
                        .GetFailureMechanisms()
                        .OfType<MacroStabilityInwardsFailureMechanism>()
-                       .Any(fm => ReferenceEquals(view.Data, fm.SectionResults));
+                       .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults));
             }
 
             if (failureMechanismContext != null)
             {
                 failureMechanism = failureMechanismContext.WrappedData;
             }
 
-            return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.SectionResults);
+            return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
         }
 
         #endregion
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -r18c24ff9abe1486f5a801cd2fee04a04279ead3f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision 18c24ff9abe1486f5a801cd2fee04a04279ead3f)
@@ -19,14 +19,14 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Controls.Views;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -70,24 +70,64 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanismSectionResults = new ObservableList<MacroStabilityInwardsFailureMechanismSectionResult>();
+            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             // Call
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanismSectionResults))
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<MacroStabilityInwardsFailureMechanismSectionResult>>(view);
-                Assert.AreSame(failureMechanismSectionResults, view.Data);
+                Assert.IsNull(view.Data);
+                Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
 
             mocks.VerifyAll();
         }
 
         [Test]
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
+
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsFailureMechanismResultView(
+                null,
+                failureMechanism,
+                failureMechanism.SectionResults);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsFailureMechanismResultView(
+                assessmentSection,
+                null,
+                new ObservableList<MacroStabilityInwardsFailureMechanismSectionResult>());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Call
-            using (ShowFailureMechanismResultsView(new ObservableList<MacroStabilityInwardsFailureMechanismSectionResult>()))
+            using (ShowFailureMechanismResultsView(
+                new MacroStabilityInwardsFailureMechanism(),
+                new ObservableList<MacroStabilityInwardsFailureMechanismSectionResult>()))
             {
                 // Assert
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -108,68 +148,17 @@
         }
 
         [Test]
-        public void Data_DataAlreadySetNewDataSet_DataSetAndDataGridViewUpdated()
+        public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
         {
             // Setup
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
-            {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
 
-                var points = new[]
-                {
-                    new Point2D(1, 2),
-                    new Point2D(3, 4)
-                };
-
-                var section = new FailureMechanismSection("test", points);
-                var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
-                var testData = new ObservableList<MacroStabilityInwardsFailureMechanismSectionResult>
-                {
-                    sectionResult
-                };
-
-                // Precondition
-                Assert.AreEqual(2, dataGridView.RowCount);
-
-                // Call
-                view.Data = testData;
-
-                // Assert
-                Assert.AreSame(testData, view.Data);
-
-                Assert.AreEqual(testData.Count, dataGridView.RowCount);
-                Assert.AreEqual(sectionResult.Section.Name, dataGridView.Rows[0].Cells[0].Value);
-            }
-        }
-
-        [Test]
-        public void Data_SetOtherThanFailureMechanismSectionResultListData_DataNullAndEmptyGrid()
-        {
-            // Setup
-            var testData = new object();
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
+            // Call
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
-                // Call
-                view.Data = testData;
-
                 // Assert
-                Assert.IsNull(view.Data);
-
-                Assert.AreEqual(0, dataGridView.RowCount);
-            }
-        }
-
-        [Test]
-        public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
-        {
-            // Setup & Call
-            using (ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
-            {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-
-                // Assert
                 DataGridViewRowCollection rows = dataGridView.Rows;
                 Assert.AreEqual(2, rows.Count);
 
@@ -197,7 +186,10 @@
             AssessmentLayerOneState assessmentLayerOneState)
         {
             // Setup
-            using (ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+
+            // Call
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -239,7 +231,8 @@
         public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex)
         {
             // Setup
-            using (ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -260,7 +253,9 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeInvalid_ShowErrorToolTip(double newValue)
         {
             // Setup
-            using (ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -281,7 +276,9 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeValid_DoNotShowErrorToolTipAndEditValue(double newValue)
         {
             // Setup
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -290,11 +287,7 @@
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-
-                var dataObject = view.Data as List<MacroStabilityInwardsFailureMechanismSectionResult>;
-                Assert.IsNotNull(dataObject);
-                MacroStabilityInwardsFailureMechanismSectionResult row = dataObject.First();
-                Assert.AreEqual(newValue, row.AssessmentLayerThree);
+                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
             }
         }
 
@@ -306,17 +299,15 @@
         {
             // Setup
             const int rowIndex = 0;
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
+                1.0 / 1000.0,
+                failureMechanism.Sections.First());
+            calculationScenario.Contribution = (RoundedDouble) 0.3;
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
 
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
-                MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
-                    1.0 / 1000.0,
-                    failureMechanism.Sections.First());
-                calculationScenario.Contribution = (RoundedDouble) 0.3;
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-                view.Data = failureMechanism.SectionResults;
-
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -341,16 +332,14 @@
         {
             // Setup
             const int rowIndex = 0;
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
+                (RoundedDouble) 1e-3,
+                failureMechanism.Sections.First());
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
 
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
-                MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
-                    (RoundedDouble) 1e-3,
-                    failureMechanism.Sections.First());
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-                view.Data = failureMechanism.SectionResults;
-
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -375,13 +364,13 @@
             // Setup
             const int rowIndex = 0;
 
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
-            {
-                MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(
-                    failureMechanism.Sections.First());
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(
+                failureMechanism.Sections.First());
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
 
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
+            {
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -406,14 +395,12 @@
             // Setup
             const int rowIndex = 0;
 
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(
+                failureMechanism.Sections.First());
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
-                MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(
-                    failureMechanism.Sections.First());
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-                view.Data = failureMechanism.SectionResults;
-
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -437,8 +424,9 @@
         {
             // Setup
             const int rowIndex = 0;
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
 
-            using (ShowFullyConfiguredFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
@@ -464,14 +452,13 @@
         {
             // Setup
             const int rowIndex = 0;
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(
+                failureMechanism.Sections.First());
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
 
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
-                MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(
-                    failureMechanism.Sections.First());
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -493,14 +480,13 @@
         {
             // Setup
             const int rowIndex = 0;
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(
+                failureMechanism.Sections.First());
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
 
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
             {
-                MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(
-                    failureMechanism.Sections.First());
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario);
-
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -520,22 +506,20 @@
         public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated()
         {
             // Given
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
-            {
-                MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
-                    0.1,
-                    failureMechanism.Sections.First());
-                calculationScenario1.Contribution = (RoundedDouble) 0.6;
-                MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
-                    0.2,
-                    failureMechanism.Sections.First());
-                calculationScenario2.Contribution = (RoundedDouble) 0.4;
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario1);
-                failureMechanism.CalculationsGroup.Children.Add(calculationScenario2);
+            MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism();
+            MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
+                0.1,
+                failureMechanism.Sections.First());
+            calculationScenario1.Contribution = (RoundedDouble) 0.6;
+            MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(
+                0.2,
+                failureMechanism.Sections.First());
+            calculationScenario2.Contribution = (RoundedDouble) 0.4;
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario1);
+            failureMechanism.CalculationsGroup.Children.Add(calculationScenario2);
 
-                view.Data = failureMechanism.SectionResults;
-
+            using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults))
+            {
                 var gridTester = new ControlTester("dataGridView");
                 var dataGridView = (DataGridView) gridTester.TheObject;
 
@@ -558,8 +542,9 @@
             }
         }
 
-        private MacroStabilityInwardsFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView(MacroStabilityInwardsFailureMechanism failureMechanism)
+        private static MacroStabilityInwardsFailureMechanism CreateFullyConfiguredFailureMechanism()
         {
+            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List<Point2D>
             {
                 new Point2D(0.0, 0.0),
@@ -572,17 +557,16 @@
                 new Point2D(10.0, 0.0)
             }));
 
-            MacroStabilityInwardsFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
-            failureMechanismResultView.Data = failureMechanism.SectionResults;
-            failureMechanismResultView.FailureMechanism = failureMechanism;
-
-            return failureMechanismResultView;
+            return failureMechanism;
         }
 
         private MacroStabilityInwardsFailureMechanismResultView ShowFailureMechanismResultsView(
+            MacroStabilityInwardsFailureMechanism failureMechanism,
             IObservableEnumerable<MacroStabilityInwardsFailureMechanismSectionResult> sectionResults)
         {
-            var failureMechanismResultView = new MacroStabilityInwardsFailureMechanismResultView(new ObservableTestAssessmentSectionStub(), sectionResults);
+            var failureMechanismResultView = new MacroStabilityInwardsFailureMechanismResultView(new ObservableTestAssessmentSectionStub(),
+                                                                                                 failureMechanism,
+                                                                                                 sectionResults);
             testForm.Controls.Add(failureMechanismResultView);
             testForm.Show();
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -r18c24ff9abe1486f5a801cd2fee04a04279ead3f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs)	(revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs)	(revision 18c24ff9abe1486f5a801cd2fee04a04279ead3f)
@@ -52,17 +52,14 @@
 
                 var failureMechanismResultView = new MacroStabilityInwardsFailureMechanismResultView(
                     assessmentSection,
+                    assessmentSection.MacroStabilityInwards,
                     assessmentSection.MacroStabilityInwards.SectionResults);
                 form.Controls.Add(failureMechanismResultView);
                 form.Show();
 
                 // Obtain the data grid view
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
-                // Set all necessary data to the view
-                failureMechanismResultView.Data = assessmentSection.MacroStabilityInwards.SectionResults;
-                failureMechanismResultView.FailureMechanism = assessmentSection.MacroStabilityInwards;
-
                 // Import failure mechanism sections and ensure the data grid view is updated
                 DataImportHelper.ImportReferenceLine(assessmentSection);
                 IFailureMechanism failureMechanism = assessmentSection.MacroStabilityInwards;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -r18c24ff9abe1486f5a801cd2fee04a04279ead3f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs)	(revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs)	(revision 18c24ff9abe1486f5a801cd2fee04a04279ead3f)
@@ -93,7 +93,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults))
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
             {
                 // Call
                 string viewName = info.GetViewName(view, failureMechanism.SectionResults);
@@ -125,7 +125,7 @@
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -156,7 +156,7 @@
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -186,7 +186,7 @@
 
             mocks.ReplayAll();
 
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -210,7 +210,7 @@
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -233,7 +233,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -257,7 +257,7 @@
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection);
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -280,7 +280,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)
             {
                 Data = failureMechanism.SectionResults
             })
@@ -300,29 +300,6 @@
         }
 
         [Test]
-        public void AfterCreate_Always_SetsSpecificPropertiesToView()
-        {
-            // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<MacroStabilityInwardsFailureMechanismSectionResult>(failureMechanism.SectionResults,
-                                                                                                                                  failureMechanism,
-                                                                                                                                  assessmentSection);
-            var view = mocks.StrictMock<MacroStabilityInwardsFailureMechanismResultView>();
-            view.Expect(v => v.FailureMechanism = failureMechanism);
-
-            mocks.ReplayAll();
-
-            // Call
-            info.AfterCreate(view, context);
-
-            // Assert
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup