Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs
===================================================================
diff -u -raf42240385db3d3f04bca830513c7464e6f74668 -r6fefc4422dcc5076f0ff430f73d829a6670f0285
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision af42240385db3d3f04bca830513c7464e6f74668)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision 6fefc4422dcc5076f0ff430f73d829a6670f0285)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Linq;
-using Core.Common.Base.Plugin;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
@@ -51,7 +50,7 @@
             using (var ringtoetsGuiPlugin = new PipingGuiPlugin())
             {
                 // assert
-                Assert.IsInstanceOf<GuiPlugin>(ringtoetsGuiPlugin);
+                Assert.IsInstanceOf<PluginBase>(ringtoetsGuiPlugin);
                 Assert.IsInstanceOf<PipingRibbon>(ringtoetsGuiPlugin.RibbonCommandHandler);
             }
         }
@@ -116,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>());
-
-            Expect.Call(guiStub.ApplicationCore).Return(applicationCore).Repeat.Any();
-
             mocks.ReplayAll();
 
             using (var guiPlugin = new PipingGuiPlugin
@@ -157,13 +151,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 PipingGuiPlugin
@@ -190,13 +179,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 PipingGuiPlugin