Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs
===================================================================
diff -u -r95e76a7e90e94621a5e9773c2a365fa8e3b6dd31 -r6fefc4422dcc5076f0ff430f73d829a6670f0285
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs	(.../HeightStructuresGuiPluginTest.cs)	(revision 95e76a7e90e94621a5e9773c2a365fa8e3b6dd31)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs	(.../HeightStructuresGuiPluginTest.cs)	(revision 6fefc4422dcc5076f0ff430f73d829a6670f0285)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base.Plugin;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
@@ -46,7 +45,7 @@
             using (var heightStructuresGuiPlugin = new HeightStructuresGuiPlugin())
             {
                 // Assert
-                Assert.IsInstanceOf<GuiPlugin>(heightStructuresGuiPlugin);
+                Assert.IsInstanceOf<PluginBase>(heightStructuresGuiPlugin);
             }
         }
 
@@ -85,12 +84,8 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var applicationCore = new ApplicationCore();
             var guiStub = mocks.Stub<IGui>();
-
             guiStub.Stub(g => g.ApplicationCommands).Return(mocks.Stub<IApplicationFeatureCommands>());
-            Expect.Call(guiStub.ApplicationCore).Return(applicationCore).Repeat.Any();
-
             mocks.ReplayAll();
 
             using (var guiPlugin = new HeightStructuresGuiPlugin
@@ -120,13 +115,8 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var applicationCore = new ApplicationCore();
-
             var guiStub = mocks.Stub<IGui>();
             guiStub.Stub(g => g.ApplicationCommands).Return(mocks.Stub<IApplicationFeatureCommands>());
-
-            guiStub.Stub(g => g.ApplicationCore).Return(applicationCore);
-
             mocks.ReplayAll();
 
             using (var guiPlugin = new HeightStructuresGuiPlugin