Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -rd689a6fa4a60da39e73668baaf90be869657ce23
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(.../FailureMechanismContributionContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(.../FailureMechanismContributionContextTreeNodeInfoTest.cs)	(revision d689a6fa4a60da39e73668baaf90be869657ce23)
@@ -37,20 +37,10 @@
     [TestFixture]
     public class FailureMechanismContributionContextTreeNodeInfoTest
     {
-        private MockRepository mocks;
-
-        [SetUp]
-        public void SetUp()
-        {
-            mocks = new MockRepository();
-        }
-
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -75,15 +65,12 @@
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
             }
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Text_Always_ReturnsTextFromResource()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -94,15 +81,12 @@
                 // Assert
                 Assert.AreEqual("Faalkansbegroting", text);
             }
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -113,13 +97,13 @@
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismContributionIcon, image);
             }
-            mocks.VerifyAll();
         }
 
         [Test]
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
+            var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var context = new FailureMechanismContributionContext(FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(),
                                                                   assessmentSection);
@@ -151,6 +135,7 @@
                     info.ContextMenuStrip(context, null, treeViewControl);
                 }
             }
+
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/NormContextTreeNodeInfoTest.cs
===================================================================
diff -u -r14a4b766ea2ec5e26a0cbcea4a377907acec56fd -rd689a6fa4a60da39e73668baaf90be869657ce23
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/NormContextTreeNodeInfoTest.cs	(.../NormContextTreeNodeInfoTest.cs)	(revision 14a4b766ea2ec5e26a0cbcea4a377907acec56fd)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/NormContextTreeNodeInfoTest.cs	(.../NormContextTreeNodeInfoTest.cs)	(revision d689a6fa4a60da39e73668baaf90be869657ce23)
@@ -37,20 +37,10 @@
     [TestFixture]
     public class NormContextTreeNodeInfoTest
     {
-        private MockRepository mocks;
-
-        [SetUp]
-        public void SetUp()
-        {
-            mocks = new MockRepository();
-        }
-
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -75,16 +65,12 @@
                 Assert.IsNull(info.CanInsert);
                 Assert.IsNull(info.OnDrop);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Text_Always_ReturnsTextFromResource()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -95,16 +81,12 @@
                 // Assert
                 Assert.AreEqual("Normen", text);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Image_Always_ReturnsNormsIcon()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -115,14 +97,13 @@
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.NormsIcon, image);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
+            var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var context = new NormContext(FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(),
                                           assessmentSection);