Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructureContext.cs
===================================================================
diff -u -rf994b1077b45f107c38c87b94ddeb5e91e1f95fe -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructureContext.cs	(.../ClosingStructureContext.cs)	(revision f994b1077b45f107c38c87b94ddeb5e91e1f95fe)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructureContext.cs	(.../ClosingStructureContext.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -28,18 +28,18 @@
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// The presentation object for <see cref="ClosingStructure"/>
+    /// The presentation object for <see cref="ClosingStructure"/>.
     /// </summary>
     public class ClosingStructureContext : ObservableWrappedObjectContextBase<ObservableList<ClosingStructure>>
     {
         /// <summary>
-        /// Creates an instance of <see cref="ClosingStructureContext"/>
+        /// Creates an instance of <see cref="ClosingStructureContext"/>.
         /// </summary>
-        /// <param name="closingStructures">The wrapped <see cref="ObservableList{T}"/> containing <see cref="ClosingStructure"/></param>
-        /// <param name="assessmentSection">The assessment section which the closing structures belong to</param>
-        /// <exception cref="ArgumentNullException">Thrown when any of the input arguments are <c>null</c></exception>
-        public ClosingStructureContext(ObservableList<ClosingStructure> closingStructures, IAssessmentSection assessmentSection) 
-            : base(closingStructures) 
+        /// <param name="closingStructures">The wrapped <see cref="ObservableList{T}"/> containing <see cref="ClosingStructure"/>.</param>
+        /// <param name="assessmentSection">The assessment section which the closing structures belong to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input arguments are <c>null</c>.</exception>
+        public ClosingStructureContext(ObservableList<ClosingStructure> closingStructures, IAssessmentSection assessmentSection)
+            : base(closingStructures)
         {
             if (assessmentSection == null)
             {
@@ -50,8 +50,8 @@
         }
 
         /// <summary>
-        /// Gets the assessment section of this instance
+        /// Gets the assessment section of this instance.
         /// </summary>
         public IAssessmentSection AssessmentSection { get; private set; }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -34,12 +34,12 @@
     public class ClosingStructuresCalculationGroupContext : ClosingStructuresContext<CalculationGroup>, ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
     {
         /// <summary>
-        /// Creates a new instance of <see cref="ClosingStructuresCalculationGroupContext"/>
+        /// Creates a new instance of <see cref="ClosingStructuresCalculationGroupContext"/>.
         /// </summary>
-        /// <param name="calculationGroup">The <see cref="CalculationGroup"/> instance that is wrapped by this context object</param>
-        /// <param name="failureMechanism">The failure mechanism of the instance</param>
-        /// <param name="assessmentSection">The assessment section of the instance</param>
-        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are null</exception>
+        /// <param name="calculationGroup">The <see cref="CalculationGroup"/> instance that is wrapped by this context object.</param>
+        /// <param name="failureMechanism">The failure mechanism of the instance.</param>
+        /// <param name="assessmentSection">The assessment section of the instance.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c>.</exception>
         public ClosingStructuresCalculationGroupContext(CalculationGroup calculationGroup, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) :
             base(calculationGroup, failureMechanism, assessmentSection) {}
     }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs	(.../ClosingStructuresContext.cs)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs	(.../ClosingStructuresContext.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -23,8 +23,8 @@
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.ClosingStructures.Data;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.ClosingStructures.Forms.Properties;
+using Ringtoets.Common.Data.AssessmentSection;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
@@ -33,18 +33,18 @@
     /// Presentation object representing all required closing structures input knowledge to configure and create
     /// related objects. It will delegate observable behaviour to the wrapped data object.
     /// </summary>
-    public abstract class ClosingStructuresContext<T> : ObservableWrappedObjectContextBase<T> where T:IObservable
+    public abstract class ClosingStructuresContext<T> : ObservableWrappedObjectContextBase<T> where T : IObservable
     {
         /// <summary>
-        /// Initializes a new instance of <see cref="ClosingStructuresContext{T}"/>
+        /// Initializes a new instance of <see cref="ClosingStructuresContext{T}"/>.
         /// </summary>
-        /// <param name="wrappedData">The concrete data instance wrapped by the context object</param>
-        /// <param name="failureMechanism">The failure mechanism which the context belongs to</param>
-        /// <param name="assessmentSection">The assessment section which the context belongs to</param>
-        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c></exception>
+        /// <param name="wrappedData">The concrete data instance wrapped by the context object.</param>
+        /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
+        /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c>.</exception>
         protected ClosingStructuresContext(T wrappedData,
-                                        ClosingStructuresFailureMechanism failureMechanism,
-                                        IAssessmentSection assessmentSection)
+                                           ClosingStructuresFailureMechanism failureMechanism,
+                                           IAssessmentSection assessmentSection)
             : base(wrappedData)
         {
             if (failureMechanism == null)
@@ -57,7 +57,7 @@
             if (assessmentSection == null)
             {
                 string message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
+                                               RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
 
                 throw new ArgumentNullException("assessmentSection", message);
             }
@@ -67,13 +67,13 @@
         }
 
         /// <summary>
-        /// Gets the assessment section for this instance
+        /// Gets the assessment section for this instance.
         /// </summary>
         public IAssessmentSection AssessmentSection { get; private set; }
 
         /// <summary>
-        /// Gets the failure mechanism for this instance
+        /// Gets the failure mechanism for this instance.
         /// </summary>
         public ClosingStructuresFailureMechanism FailureMechanism { get; private set; }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -89,6 +89,7 @@
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
       <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
       <Name>Ringtoets.HydraRing.Data</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs	(.../ClosingStructuresContextTest.cs)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs	(.../ClosingStructuresContextTest.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -40,16 +40,16 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var target = mockRepository.Stub<IObservable>();
             mockRepository.ReplayAll();
 
-            var target = new ObservableObject();
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
             // Call
-            var context = new SimpleClosingStructuresContext<ObservableObject>(target, failureMechanism, assessmentSectionMock);
+            var context = new SimpleClosingStructuresContext<IObservable>(target, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableObject>>(context);
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IObservable>>(context);
             Assert.AreSame(target, context.WrappedData);
             Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
@@ -61,13 +61,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var observableObject = mockRepository.Stub<IObservable>();
             mockRepository.ReplayAll();
 
-            var observableObject = new ObservableObject();
-
             // Call
-            TestDelegate call = () => new SimpleClosingStructuresContext<ObservableObject>(observableObject, null, assessmentSectionMock);
+            TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, null, assessmentSectionMock);
 
             // Assert
             const string expectedMessage = "Het sluitings kunstwerk toetsspoor mag niet 'null' zijn.";
@@ -79,19 +78,20 @@
         public void ParameteredConstructor_AssessmentSectionIsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var observableObject = new ObservableObject();
+            var mockRepository = new MockRepository();
+            var observableObject = mockRepository.Stub<IObservable>();
+            mockRepository.ReplayAll();
+
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
             // Call
-            TestDelegate call = () => new SimpleClosingStructuresContext<ObservableObject>(observableObject, failureMechanism, null);
+            TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, failureMechanism, null);
 
             // Assert
             const string expectedMessage = "Het traject mag niet 'null' zijn.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
         }
 
-        private class ObservableObject : Observable { }
-
         private class SimpleClosingStructuresContext<T> : ClosingStructuresContext<T> where T : IObservable
         {
             public SimpleClosingStructuresContext(T target, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -46,7 +46,7 @@
         public void SetUp()
         {
             mocks = new MockRepository();
-            guiMock = mocks.StrictMock<IGui>();
+            guiMock = mocks.Stub<IGui>();
             plugin = new ClosingStructuresPlugin()
             {
                 Gui = guiMock
@@ -55,6 +55,13 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresCalculationGroupContext));
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+        }
+
         [Test]
         public void ContextMenuStrip_WithoutParentNodeDefaultBehavior_CallsContextMenuBuilderMethods()
         {
@@ -63,8 +70,8 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var groupContext = new ClosingStructuresCalculationGroupContext(group,
-                                                                           failureMechanism,
-                                                                           assessmentSectionMock);
+                                                                            failureMechanism,
+                                                                            assessmentSectionMock);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
             /* Part of WTI-550
@@ -75,9 +82,9 @@
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-             * */
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            **/
             menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
@@ -98,4 +105,4 @@
             // Assert expectancies called in TearDown()
         }
     }
-}
+}
\ No newline at end of file