Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r0f5c5c3c32c56b85768022c11eddbffc86f638a6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 0f5c5c3c32c56b85768022c11eddbffc86f638a6)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.Views;
 
@@ -64,12 +64,8 @@
             var assessmentSection = new AssessmentSection(initialComposition);
 
             using (var form = new Form())
-            using (var view = new FailureMechanismContributionView(viewCommands)
+            using (var view = new FailureMechanismContributionView(assessmentSection, viewCommands))
             {
-                Data = assessmentSection.FailureMechanismContribution,
-                AssessmentSection = assessmentSection
-            })
-            {
                 form.Controls.Add(view);
                 form.Show();
 
@@ -82,7 +78,7 @@
 
                 // When
                 assessmentSection.ChangeComposition(newComposition);
-                assessmentSection.FailureMechanismContribution.NotifyObservers();
+                assessmentSection.NotifyObservers();
 
                 // Then
                 var compositionLabel = (Label) new ControlTester(assessmentSectionCompositionLabelName).TheObject;
@@ -93,24 +89,25 @@
 
                 Assert.IsTrue(dataGridInvalidated,
                               "Expect the DataGridView to be flagged for redrawing.");
-                AssertDataGridViewDataSource(assessmentSection.FailureMechanismContribution.Distribution, contributionGridView);
+                AssertDataGridViewDataSource(assessmentSection.GetContributingFailureMechanisms(), contributionGridView, assessmentSection.FailureMechanismContribution.Norm);
             }
+
             mocks.VerifyAll();
         }
 
-        private static void AssertDataGridViewDataSource(IEnumerable<FailureMechanismContributionItem> expectedDistributionElements, DataGridView dataGridView)
+        private static void AssertDataGridViewDataSource(IEnumerable<IFailureMechanism> expectedElements, DataGridView dataGridView, double norm)
         {
-            FailureMechanismContributionItem[] itemArray = expectedDistributionElements.ToArray();
+            IFailureMechanism[] itemArray = expectedElements.ToArray();
             Assert.AreEqual(itemArray.Length, dataGridView.RowCount);
             for (var i = 0; i < itemArray.Length; i++)
             {
-                FailureMechanismContributionItem expectedElement = itemArray[i];
+                IFailureMechanism expectedElement = itemArray[i];
                 DataGridViewRow row = dataGridView.Rows[i];
                 Assert.AreEqual(expectedElement.IsRelevant, row.Cells[isRelevantColumnIndex].Value);
-                Assert.AreEqual(expectedElement.Assessment, row.Cells[nameColumnIndex].Value);
-                Assert.AreEqual(expectedElement.AssessmentCode, row.Cells[codeColumnIndex].Value);
+                Assert.AreEqual(expectedElement.Name, row.Cells[nameColumnIndex].Value);
+                Assert.AreEqual(expectedElement.Code, row.Cells[codeColumnIndex].Value);
                 Assert.AreEqual(expectedElement.Contribution, row.Cells[contributionColumnIndex].Value);
-                Assert.AreEqual(expectedElement.ProbabilitySpace, row.Cells[probabilitySpaceColumnIndex].Value);
+                Assert.AreEqual(100 / (expectedElement.Contribution * norm), row.Cells[probabilitySpaceColumnIndex].Value);
             }
         }
     }