Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -r6e56258ed65fb071d7dac5a9df4e71196542a392 -r0cc64a130e25bd1cb8ffa996799b2556c7798269
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 0cc64a130e25bd1cb8ffa996799b2556c7798269)
@@ -52,7 +52,7 @@
         }
 
         [Test]
-        public void GetPropertyInfos_ReturnsSupportedPropertyClassesWithExpectedValues()
+        public void GetPropertyInfos_ReturnsSupportedPropertyInfos()
         {
             // Setup
             using (var plugin = new HeightStructuresPlugin())
@@ -84,22 +84,13 @@
         public void GetTreeNodeInfos_ReturnsSupportedTreeNodeInfos()
         {
             // Setup
-            var mocks = new MockRepository();
-            var guiStub = mocks.Stub<IGui>();
-            guiStub.Stub(g => g.ApplicationCommands).Return(mocks.Stub<IApplicationFeatureCommands>());
-            mocks.ReplayAll();
-
-            using (var plugin = new HeightStructuresPlugin
+            using (var plugin = new HeightStructuresPlugin())
             {
-                Gui = guiStub
-            })
-            {
                 // Call
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
                 Assert.AreEqual(8, treeNodeInfos.Length);
-
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HeightStructuresFailureMechanismContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HeightStructuresCalculationGroupContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HeightStructuresCalculationContext)));
@@ -109,24 +100,14 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HeightStructuresScenariosContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>)));
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void GetViewInfos_ReturnsSupportedViewInfos()
         {
             // Setup
-            var mocks = new MockRepository();
-            var guiStub = mocks.Stub<IGui>();
-            guiStub.Stub(g => g.ApplicationCommands).Return(mocks.Stub<IApplicationFeatureCommands>());
-            mocks.ReplayAll();
-
-            using (var plugin = new HeightStructuresPlugin
+            using (var plugin = new HeightStructuresPlugin())
             {
-                Gui = guiStub
-            })
-            {
                 // Call
                 ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray();
 
@@ -150,11 +131,10 @@
                     typeof(CalculationGroup),
                     typeof(HeightStructuresScenariosView));
             }
-            mocks.VerifyAll();
         }
 
         [Test]
-        public void GetImportInfos_ReturnsExpectedImportInfos()
+        public void GetImportInfos_ReturnsSupportedImportInfos()
         {
             // Setup
             using (var plugin = new HeightStructuresPlugin())