Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CloseForFailureMechanismView.cs
===================================================================
diff -u -r24a4dedceab58b48ea5ca0a463a0a7b614e26590 -rba46b2d15caa390a7bbf642e4816d06fc00a3fac
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CloseForFailureMechanismView.cs	(.../CloseForFailureMechanismView.cs)	(revision 24a4dedceab58b48ea5ca0a463a0a7b614e26590)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CloseForFailureMechanismView.cs	(.../CloseForFailureMechanismView.cs)	(revision ba46b2d15caa390a7bbf642e4816d06fc00a3fac)
@@ -27,7 +27,8 @@
 namespace Ringtoets.Common.Forms.Views
 {
     /// <summary>
-    /// Class defining a base view for assembly category views.
+    /// Class defining a base view that contains an <see cref="IFailureMechanism"/> instance and
+    /// will be closed for that object.
     /// </summary>
     public abstract class CloseForFailureMechanismView : UserControl, IView
     {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CloseForFailureMechanismViewTest.cs
===================================================================
diff -u -r24a4dedceab58b48ea5ca0a463a0a7b614e26590 -rba46b2d15caa390a7bbf642e4816d06fc00a3fac
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CloseForFailureMechanismViewTest.cs	(.../CloseForFailureMechanismViewTest.cs)	(revision 24a4dedceab58b48ea5ca0a463a0a7b614e26590)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CloseForFailureMechanismViewTest.cs	(.../CloseForFailureMechanismViewTest.cs)	(revision ba46b2d15caa390a7bbf642e4816d06fc00a3fac)
@@ -57,7 +57,7 @@
             Assert.IsInstanceOf<IView>(view);
             Assert.IsNull(view.Data);
             Assert.AreSame(failureMechanism, view.FailureMechanism);
-            Assert.AreEqual(0, view.Controls.Count);
+            CollectionAssert.IsEmpty(view.Controls);
         }
 
         private class TestCloseForFailureMechanismView : CloseForFailureMechanismView
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs
===================================================================
diff -u -r59c178a747bcbd3b5f05f68f6b9b87cfe053047f -rba46b2d15caa390a7bbf642e4816d06fc00a3fac
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs	(.../FailureMechanismSectionsViewTest.cs)	(revision 59c178a747bcbd3b5f05f68f6b9b87cfe053047f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs	(.../FailureMechanismSectionsViewTest.cs)	(revision ba46b2d15caa390a7bbf642e4816d06fc00a3fac)
@@ -90,6 +90,7 @@
                 // Assert
                 Assert.IsInstanceOf<CloseForFailureMechanismView>(view);
                 Assert.IsNull(view.Data);
+                Assert.AreSame(failureMechanism, view.FailureMechanism);
                 Assert.AreEqual(1, view.Controls.Count);
 
                 DataGridViewControl sectionsDataGridViewControl = GetSectionsDataGridViewControl(view);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyCategoriesView.cs
===================================================================
diff -u -r4c3c7f88f5e6cffb2e36802472c7c85ab9296fe2 -rba46b2d15caa390a7bbf642e4816d06fc00a3fac
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyCategoriesView.cs	(.../FailureMechanismAssemblyCategoriesView.cs)	(revision 4c3c7f88f5e6cffb2e36802472c7c85ab9296fe2)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismAssemblyCategoriesView.cs	(.../FailureMechanismAssemblyCategoriesView.cs)	(revision ba46b2d15caa390a7bbf642e4816d06fc00a3fac)
@@ -23,9 +23,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Controls.Views;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
@@ -59,7 +57,7 @@
                                                       IAssessmentSection assessmentSection,
                                                       Func<IEnumerable<FailureMechanismAssemblyCategory>> getFailureMechanismAssemblyCategoriesFunc,
                                                       Func<IEnumerable<FailureMechanismSectionAssemblyCategory>> getFailureMechanismSectionAssemblyCategoriesFunc)
-        : base(failureMechanism)
+            : base(failureMechanism)
         {
             if (assessmentSection == null)
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyCategoriesViewTest.cs
===================================================================
diff -u -r1a1e3607cf41c9e963c0ba8fce0885106cb8769f -rba46b2d15caa390a7bbf642e4816d06fc00a3fac
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyCategoriesViewTest.cs	(.../FailureMechanismAssemblyCategoriesViewTest.cs)	(revision 1a1e3607cf41c9e963c0ba8fce0885106cb8769f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismAssemblyCategoriesViewTest.cs	(.../FailureMechanismAssemblyCategoriesViewTest.cs)	(revision ba46b2d15caa390a7bbf642e4816d06fc00a3fac)
@@ -119,6 +119,7 @@
                 // Assert
                 Assert.IsInstanceOf<CloseForFailureMechanismView>(view);
                 Assert.IsNull(view.Data);
+                Assert.AreSame(failureMechanism, view.FailureMechanism);
                 Assert.AreEqual(1, view.Controls.Count);
 
                 TableLayoutPanel tableLayoutPanel = ControlTestHelper.GetControls<TableLayoutPanel>(view, "tableLayoutPanel").Single();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/MacroStabilityOutwardsAssemblyCategoriesViewTest.cs
===================================================================
diff -u -r2da5195c838a61f9b98a178d4add2e93d7c7bfb7 -rba46b2d15caa390a7bbf642e4816d06fc00a3fac
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/MacroStabilityOutwardsAssemblyCategoriesViewTest.cs	(.../MacroStabilityOutwardsAssemblyCategoriesViewTest.cs)	(revision 2da5195c838a61f9b98a178d4add2e93d7c7bfb7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/MacroStabilityOutwardsAssemblyCategoriesViewTest.cs	(.../MacroStabilityOutwardsAssemblyCategoriesViewTest.cs)	(revision ba46b2d15caa390a7bbf642e4816d06fc00a3fac)
@@ -94,6 +94,7 @@
                 // Assert
                 Assert.IsInstanceOf<CloseForFailureMechanismView>(view);
                 Assert.IsNull(view.Data);
+                Assert.AreSame(failureMechanism, view.FailureMechanism);
                 Assert.AreEqual(1, view.Controls.Count);
 
                 Panel groupBoxPanel = ControlTestHelper.GetControls<Panel>(view, "groupBoxPanel").Single();