Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismContext.cs
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r86c5aff166a7a2822ac8d77be371249ee3a155b6
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismContext.cs	(.../GrassCoverErosionInwardsFailureMechanismContext.cs)	(revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismContext.cs	(.../GrassCoverErosionInwardsFailureMechanismContext.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -26,6 +26,9 @@
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects
 {
+    /// <summary>
+    /// This class is a presentation object for an instance of <see cref="GrassCoverErosionInwardsFailureMechanism"/>.
+    /// </summary>
     public class GrassCoverErosionInwardsFailureMechanismContext : FailureMechanismContext<GrassCoverErosionInwardsFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r86c5aff166a7a2822ac8d77be371249ee3a155b6
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -27,6 +27,9 @@
 
 namespace Ringtoets.GrassCoverErosionInwards.Plugin
 {
+    /// <summary>
+    /// The GUI plug-in for the <see cref="Ringtoets.GrassCoverErosionInwards.Data.GrassCoverErosionInwardsFailureMechanism"/>.
+    /// </summary>
     public class GrassCoverErosionInwardsGuiPlugin : GuiPlugin
     {
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r86c5aff166a7a2822ac8d77be371249ee3a155b6
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -129,15 +129,17 @@
         }
 
         [Test]
-        public void Detach_DetachNonAttachedObserver_ThrowsNoException()
+        public void Detach_DetachNonAttachedObserver_DoesNotThrowException()
         {
             // Setup
             var observer = mockRepository.StrictMock<IObserver>();
+            mockRepository.ReplayAll();
 
             var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             // Call & Assert
             grassCoverErosionInwardsFailureMechanism.Detach(observer);
+            mockRepository.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r86c5aff166a7a2822ac8d77be371249ee3a155b6
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -42,12 +42,17 @@
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NUnitForms">
+      <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
+    </Reference>
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -57,6 +62,7 @@
   <ItemGroup>
     <Compile Include="PresentationObjects\GrassCoverErosionInwardsFailureMechanismContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TreeNodeInfos\GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
@@ -69,6 +75,18 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
+      <Project>{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}</Project>
+      <Name>Core.Common.Controls.TreeView</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
@@ -85,7 +103,12 @@
       <Project>{C540E627-B95B-4CC0-A1B6-A0BDF74936C7}</Project>
       <Name>Ringtoets.GrassCoverErosionInwards.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.GrassCoverErosionInwards.Plugin\Ringtoets.GrassCoverErosionInwards.Plugin.csproj">
+      <Project>{20955E2A-8CEB-46B0-ADC4-A97D4C6BBDF5}</Project>
+      <Name>Ringtoets.GrassCoverErosionInwards.Plugin</Name>
+    </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -0,0 +1,100 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Controls.TreeView;
+using Core.Common.TestUtil;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.GrassCoverErosionInwards.Data;
+using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
+using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
+using Ringtoets.GrassCoverErosionInwards.Plugin;
+
+namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest : NUnitFormTest
+    {
+        private MockRepository mocks;
+        private GrassCoverErosionInwardsGuiPlugin plugin;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            plugin = new GrassCoverErosionInwardsGuiPlugin();
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionInwardsFailureMechanismContext));
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(GrassCoverErosionInwardsFailureMechanismContext), info.TagType);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNull(info.CanDrag);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
+        public void Text_Always_ReturnsName()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var mechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var mechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(mechanism, assessmentSection);
+
+            // Call
+            var text = info.Text(mechanismContext);
+
+            // Assert
+            const string expectedName = "Dijken - Grasbekleding erosie kruin en binnentalud";
+            Assert.AreEqual(expectedName, text);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Image_Always_ReturnsPlaceHolderIcon()
+        {
+            // Call
+            var image = info.Image(null);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(Resources.GrassCoverErosionInwardsIcon, image);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r52fb2dd367bdca54564201857ed6e0b3cc244693 -r86c5aff166a7a2822ac8d77be371249ee3a155b6
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 52fb2dd367bdca54564201857ed6e0b3cc244693)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -24,7 +24,6 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms;
@@ -50,6 +49,9 @@
 
 namespace Ringtoets.Piping.Plugin
 {
+    /// <summary>
+    /// The GUI plug-in for the <see cref="PipingFailureMechanism"/>.
+    /// </summary>
     public class PipingGuiPlugin : GuiPlugin
     {
         public override IRibbonCommandHandler RibbonCommandHandler
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -rc7c07db38829afdc5965c331844e1d39123944ff -r86c5aff166a7a2822ac8d77be371249ee3a155b6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision c7c07db38829afdc5965c331844e1d39123944ff)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
@@ -49,14 +49,9 @@
 
 namespace Ringtoets.Piping.Forms.Test.TreeNodeInfos
 {
+    [TestFixture]
     public class PipingFailureMechanismTreeNodeInfoTest : NUnitFormTest
     {
-        private const int contextMenuAddFolderIndex = 1;
-        private const int contextMenuAddCalculationIndex = 2;
-        private const int contextMenuValidateAllIndex = 4;
-        private const int contextMenuCalculateAllIndex = 5;
-        private const int contextMenuClearIndex = 6;
-
         private MockRepository mocks;
         private PipingGuiPlugin plugin;
         private TreeNodeInfo info;
@@ -140,7 +135,7 @@
             var inputsFolder = (CategoryTreeFolder) children[0];
             Assert.AreEqual("Invoer", inputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Input, inputsFolder.Category);
-            
+
             Assert.AreEqual(4, inputsFolder.Contents.Count);
             var failureMechanismSectionsContext = (FailureMechanismSectionsContext) inputsFolder.Contents[0];
             CollectionAssert.AreEqual(pipingFailureMechanism.Sections, failureMechanismSectionsContext.WrappedData);
@@ -169,7 +164,7 @@
             Assert.AreEqual("Uitvoer", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            var failureMechanismResultsContext = (FailureMechanismSectionResultContext)outputsFolder.Contents[0];
+            var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputsFolder.Contents[0];
             Assert.AreSame(pipingFailureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(pipingFailureMechanism.SectionResults, failureMechanismResultsContext.SectionResults);
             mocks.VerifyAll();
@@ -644,5 +639,11 @@
             // Assert
             mocks.VerifyAll();
         }
+
+        private const int contextMenuAddFolderIndex = 1;
+        private const int contextMenuAddCalculationIndex = 2;
+        private const int contextMenuValidateAllIndex = 4;
+        private const int contextMenuCalculateAllIndex = 5;
+        private const int contextMenuClearIndex = 6;
     }
 }
\ No newline at end of file