Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4ca4b2260f66713349c9aae32f5f4b82373c312b -rc9396d0af18873fda14c7e486decbfca7d4e8b21
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4ca4b2260f66713349c9aae32f5f4b82373c312b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
@@ -66,9 +66,20 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HeightStructuresFailureMechanismContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocksRepository.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
+            // Setup
+            mocksRepository.ReplayAll();
+
             // Assert
             Assert.AreEqual(typeof(HeightStructuresFailureMechanismContext), info.TagType);
             Assert.IsNotNull(info.Text);
@@ -127,8 +138,6 @@
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>) outputsFolder.Contents[0];
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
-
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -151,8 +160,6 @@
             Assert.AreEqual(1, children.Length);
             var commentContext = (CommentContext<ICommentable>) children[0];
             Assert.AreSame(failureMechanism, commentContext.WrappedData);
-
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -193,7 +200,7 @@
                 info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
             }
             // Assert
-            mocksRepository.VerifyAll();
+            // Assert expectancies are called in TearDown()
         }
 
         [Test]
@@ -227,7 +234,7 @@
                 info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
             }
             // Assert
-            mocksRepository.VerifyAll();
+            // Assert expectancies are called in TearDown()
         }
 
         [Test]
@@ -272,8 +279,6 @@
                                                               RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
                                                               RingtoetsCommonFormsResources.ClearIcon,
                                                               false);
-
-                mocksRepository.VerifyAll();
             }
         }
 
@@ -310,8 +315,6 @@
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
                                                               RingtoetsCommonFormsResources.Checkbox_ticked);
-
-                mocksRepository.VerifyAll();
             }
         }
 
@@ -343,7 +346,7 @@
                 contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick();
             }
             // Assert
-            mocksRepository.VerifyAll();
+            // Assert expectancies are called in TearDown()
         }
 
         [Test]
@@ -373,7 +376,7 @@
                 contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick();
             }
             // Assert
-            mocksRepository.VerifyAll();
+            // Assert expectancies are called in TearDown()
         }
 
         [Test]
@@ -407,7 +410,6 @@
                                                               RingtoetsFormsResources.CalculateIcon,
                                                               false);
             }
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -446,7 +448,6 @@
                                                               RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
             }
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -486,7 +487,6 @@
                 TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -532,7 +532,6 @@
                                                               RingtoetsFormsResources.Calculate_all_ToolTip,
                                                               RingtoetsFormsResources.CalculateAllIcon);
             }
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -612,7 +611,6 @@
                     Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
                 });
             }
-            mocksRepository.VerifyAll();
         }
 
         private const int contextMenuRelevancyIndexWhenRelevant = 1;