Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj
===================================================================
diff -u -r2c2617e3fcd68361a13445bee442ed148c837b62 -r44ad6cd3235561c4491039dc0838226230708b9e
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision 2c2617e3fcd68361a13445bee442ed148c837b62)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision 44ad6cd3235561c4491039dc0838226230708b9e)
@@ -52,7 +52,6 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ViewInfoTestTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Fisheye: Tag 44ad6cd3235561c4491039dc0838226230708b9e refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil.Test/ViewInfoTestTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj
===================================================================
diff -u -r2c2617e3fcd68361a13445bee442ed148c837b62 -r44ad6cd3235561c4491039dc0838226230708b9e
--- Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(.../Core.Common.Gui.TestUtil.csproj)	(revision 2c2617e3fcd68361a13445bee442ed148c837b62)
+++ Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(.../Core.Common.Gui.TestUtil.csproj)	(revision 44ad6cd3235561c4491039dc0838226230708b9e)
@@ -86,7 +86,6 @@
     <Compile Include="ContextMenu\CustomItemsOnlyContextMenuBuilder.cs" />
     <Compile Include="PluginTestHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewInfoTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
Fisheye: Tag 44ad6cd3235561c4491039dc0838226230708b9e refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil/ViewInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -r2c2617e3fcd68361a13445bee442ed148c837b62 -r44ad6cd3235561c4491039dc0838226230708b9e
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs)	(revision 2c2617e3fcd68361a13445bee442ed148c837b62)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs)	(revision 44ad6cd3235561c4491039dc0838226230708b9e)
@@ -20,11 +20,12 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using System.Linq;
 using Core.Common.Base;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.Plugin;
-using Core.Common.Gui.TestUtil;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -38,8 +39,25 @@
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ViewInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest : ViewInfoTest<GrassCoverErosionOutwardsDesignWaterLevelLocationsView>
+    public class GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest
     {
+
+        [TestCase]
+        public void Initialized_Always_DataTypeAndViewTypeAsExpected()
+        {
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                var info = GetInfo(plugin);
+
+                Assert.NotNull(info, "Expected a viewInfo definition for views with type {0}.", typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsView));
+                Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContext), info.DataType);
+                Assert.AreEqual(typeof(IEnumerable<HydraulicBoundaryLocation>), info.ViewDataType);
+                Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsView), info.ViewType);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, info.Image);
+                Assert.AreEqual(Resources.GrassCoverErosionOutwardsWaterLevelLocations_DisplayName, info.GetViewName(null, null));
+            }
+        }
+
         [Test]
         public void AfterCreate_Always_SetsExpectedProperties()
         {
@@ -49,40 +67,30 @@
             IMainWindow windowsStub = mockRepository.Stub<IMainWindow>();
             guiStub.Stub(gs => gs.MainWindow).Return(windowsStub);
             mockRepository.ReplayAll();
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                var info = GetInfo(plugin);
 
-            var data = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(new ObservableList<HydraulicBoundaryLocation>(), assessmentSectionStub);
-            Plugin.Gui = guiStub;
-            Plugin.Activate();
+                var data = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(new ObservableList<HydraulicBoundaryLocation>(), assessmentSectionStub);
+                plugin.Gui = guiStub;
+                plugin.Activate();
 
-            using (var view = CreateView())
-            {
-                Info.AfterCreate(view, data);
+                using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView())
+                {
+                    info.AfterCreate(view, data);
 
-                // Assert
-                Assert.AreSame(assessmentSectionStub, view.AssessmentSection);
-                Assert.AreSame(guiStub, view.ApplicationSelection);
-                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationGuiService>(view.CalculationGuiService);
+                    // Assert
+                    Assert.AreSame(assessmentSectionStub, view.AssessmentSection);
+                    Assert.AreSame(guiStub, view.ApplicationSelection);
+                    Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationGuiService>(view.CalculationGuiService);
+                }
             }
-
             mockRepository.VerifyAll();
         }
 
-        public GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest()
+        private ViewInfo GetInfo(PluginBase plugin)
         {
-            DataType = typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContext);
-            ViewDataType = typeof(IEnumerable<HydraulicBoundaryLocation>);
-            ViewIcon = RingtoetsCommonFormsResources.GenericInputOutputIcon;
-            ViewName = Resources.GrassCoverErosionOutwardsWaterLevelLocations_DisplayName;
+            return plugin.GetViewInfos().FirstOrDefault(vi => vi.ViewType == typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsView));
         }
-
-        protected override GrassCoverErosionOutwardsDesignWaterLevelLocationsView CreateView()
-        {
-            return new GrassCoverErosionOutwardsDesignWaterLevelLocationsView();
-        }
-
-        protected override PluginBase CreatePlugin()
-        {
-            return new GrassCoverErosionOutwardsPlugin();
-        }
     }
 }
\ No newline at end of file