Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2 -rc9396d0af18873fda14c7e486decbfca7d4e8b21
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
@@ -50,9 +50,19 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HeightStructuresInputContext));
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+            mocksRepository.VerifyAll();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
+            // Setup
+            mocksRepository.ReplayAll();
+
             // Assert
             Assert.AreEqual(typeof(HeightStructuresInputContext), info.TagType);
             Assert.IsNotNull(info.Text);
@@ -92,7 +102,6 @@
 
             // Assert
             Assert.AreEqual(HeightStructuresFormsResources.HeightStructuresInputContext_NodeDisplayName, text);
-            mocksRepository.VerifyAll();
         }
 
         [Test]
@@ -114,8 +123,6 @@
             // Assert
             TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
 
-            mocksRepository.VerifyAll();
-
         }
 
         [Test]
@@ -142,7 +149,7 @@
                 info.ContextMenuStrip(null, null, treeViewControl);
             }
             // Assert
-            mocksRepository.VerifyAll();
+            // Assert expectancies are called in TearDown()
         }
     }
 }
\ No newline at end of file