Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingOutputProperties.cs
===================================================================
diff -u -r88a3d3d59340f442a071cb4f909ea51bb62d50ca -r0136ed16ad91ea9ea0dd2836ea7cfbf5750afc23
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingOutputProperties.cs	(.../OvertoppingOutputProperties.cs)	(revision 88a3d3d59340f442a071cb4f909ea51bb62d50ca)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingOutputProperties.cs	(.../OvertoppingOutputProperties.cs)	(revision 0136ed16ad91ea9ea0dd2836ea7cfbf5750afc23)
@@ -47,7 +47,7 @@
         /// Creates a new instance of <see cref="OvertoppingOutputProperties"/>.
         /// </summary>
         /// <param name="overtoppingOutput">The overtopping output to create the object properties for.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="overtoppingOutput"/> is <c>null</c>.</exception>
         public OvertoppingOutputProperties(OvertoppingOutput overtoppingOutput)
         {
             if (overtoppingOutput == null)
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -re3b88445e0f23bc2d7d5607ffe491f72af704df1 -r0136ed16ad91ea9ea0dd2836ea7cfbf5750afc23
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingOutputContextTreeNodeInfoTest.cs	(.../OvertoppingOutputContextTreeNodeInfoTest.cs)	(revision e3b88445e0f23bc2d7d5607ffe491f72af704df1)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingOutputContextTreeNodeInfoTest.cs	(.../OvertoppingOutputContextTreeNodeInfoTest.cs)	(revision 0136ed16ad91ea9ea0dd2836ea7cfbf5750afc23)
@@ -37,14 +37,12 @@
     [TestFixture]
     public class OvertoppingOutputContextTreeNodeInfoTest
     {
-        private MockRepository mocks;
         private GrassCoverErosionInwardsPlugin plugin;
         private TreeNodeInfo info;
 
         [SetUp]
         public void SetUp()
         {
-            mocks = new MockRepository();
             plugin = new GrassCoverErosionInwardsPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(OvertoppingOutputContext));
         }
@@ -53,15 +51,11 @@
         public void TearDown()
         {
             plugin.Dispose();
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
-            // Setup
-            mocks.ReplayAll();
-
             // Assert
             Assert.IsNotNull(info.Text);
             Assert.IsNotNull(info.ForeColor);
@@ -86,9 +80,6 @@
         [Test]
         public void Text_Always_ReturnsFromResource()
         {
-            // Setup
-            mocks.ReplayAll();
-
             // Call
             string text = info.Text(null);
 
@@ -100,8 +91,6 @@
         public void ForeColor_HasNoOutput_ReturnGrayText()
         {
             // Setup
-            mocks.ReplayAll();
-
             var calculation = new GrassCoverErosionInwardsCalculation();
 
             // Call
@@ -115,8 +104,6 @@
         public void ForeColor_HasOutput_ReturnControlText()
         {
             // Setup
-            mocks.ReplayAll();
-
             var calculation = new GrassCoverErosionInwardsCalculation
             {
                 Output = new GrassCoverErosionInwardsOutput(
@@ -135,9 +122,6 @@
         [Test]
         public void Image_Always_ReturnsGeneralOutputIcon()
         {
-            // Setup
-            mocks.ReplayAll();
-
             // Call
             Image image = info.Image(null);
 
@@ -149,6 +133,7 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
+            var mocks = new MockRepository();
             var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
             using (mocks.Ordered())
             {
@@ -171,7 +156,7 @@
             }
 
             // Assert
-            // Assert expectancies called in TearDown()
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file