Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj
===================================================================
diff -u -ra564e4c5a94e25d402a800fc102fefb68b20bc68 -r98cb2245bb3d098cf522b793b288ade596b7e3df
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision a564e4c5a94e25d402a800fc102fefb68b20bc68)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision 98cb2245bb3d098cf522b793b288ade596b7e3df)
@@ -37,6 +37,7 @@
     <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\ClosingStructures\src\Riskeer.ClosingStructures.Data\Riskeer.ClosingStructures.Data.csproj" />
     <ProjectReference Include="..\..\..\ClosingStructures\src\Riskeer.ClosingStructures.Forms\Riskeer.ClosingStructures.Forms.csproj" />
+    <ProjectReference Include="..\..\..\ClosingStructures\src\Riskeer.ClosingStructures.Plugin\Riskeer.ClosingStructures.Plugin.csproj" />
     <ProjectReference Include="..\..\..\ClosingStructures\test\Riskeer.ClosingStructures.Data.TestUtil\Riskeer.ClosingStructures.Data.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj" />
@@ -54,11 +55,14 @@
     <ProjectReference Include="..\..\..\DuneErosion\test\Riskeer.DuneErosion.Data.TestUtil\Riskeer.DuneErosion.Data.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\GrassCoverErosionInwards\src\Riskeer.GrassCoverErosionInwards.Data\Riskeer.GrassCoverErosionInwards.Data.csproj" />
     <ProjectReference Include="..\..\..\GrassCoverErosionInwards\src\Riskeer.GrassCoverErosionInwards.Forms\Riskeer.GrassCoverErosionInwards.Forms.csproj" />
+    <ProjectReference Include="..\..\..\GrassCoverErosionInwards\src\Riskeer.GrassCoverErosionInwards.Plugin\Riskeer.GrassCoverErosionInwards.Plugin.csproj" />
     <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\src\Riskeer.GrassCoverErosionOutwards.Data\Riskeer.GrassCoverErosionOutwards.Data.csproj" />
     <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\src\Riskeer.GrassCoverErosionOutwards.Forms\Riskeer.GrassCoverErosionOutwards.Forms.csproj" />
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\src\Riskeer.GrassCoverErosionOutwards.Plugin\Riskeer.GrassCoverErosionOutwards.Plugin.csproj" />
     <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\test\Riskeer.GrassCoverErosionOutwards.Data.TestUtil\Riskeer.GrassCoverErosionOutwards.Data.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Data\Riskeer.HeightStructures.Data.csproj" />
     <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Forms\Riskeer.HeightStructures.Forms.csproj" />
+    <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Plugin\Riskeer.HeightStructures.Plugin.csproj" />
     <ProjectReference Include="..\..\..\HeightStructures\test\Riskeer.HeightStructures.Data.TestUtil\Riskeer.HeightStructures.Data.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj" />
     <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.IO\Riskeer.HydraRing.IO.csproj" />
@@ -78,11 +82,14 @@
     <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj" />
     <ProjectReference Include="..\..\..\StabilityPointStructures\src\Riskeer.StabilityPointStructures.Data\Riskeer.StabilityPointStructures.Data.csproj" />
     <ProjectReference Include="..\..\..\StabilityPointStructures\src\Riskeer.StabilityPointStructures.Forms\Riskeer.StabilityPointStructures.Forms.csproj" />
+    <ProjectReference Include="..\..\..\StabilityPointStructures\src\Riskeer.StabilityPointStructures.Plugin\Riskeer.StabilityPointStructures.Plugin.csproj" />
     <ProjectReference Include="..\..\..\StabilityPointStructures\test\Riskeer.StabilityPointStructures.Data.TestUtil\Riskeer.StabilityPointStructures.Data.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\StabilityStoneCover\src\Riskeer.StabilityStoneCover.Data\Riskeer.StabilityStoneCover.Data.csproj" />
     <ProjectReference Include="..\..\..\StabilityStoneCover\src\Riskeer.StabilityStoneCover.Forms\Riskeer.StabilityStoneCover.Forms.csproj" />
+    <ProjectReference Include="..\..\..\StabilityStoneCover\src\Riskeer.StabilityStoneCover.Plugin\Riskeer.StabilityStoneCover.Plugin.csproj" />
     <ProjectReference Include="..\..\..\WaveImpactAsphaltCover\src\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj" />
     <ProjectReference Include="..\..\..\WaveImpactAsphaltCover\src\Riskeer.WaveImpactAsphaltCover.Forms\Riskeer.WaveImpactAsphaltCover.Forms.csproj" />
+    <ProjectReference Include="..\..\..\WaveImpactAsphaltCover\src\Riskeer.WaveImpactAsphaltCover.Plugin\Riskeer.WaveImpactAsphaltCover.Plugin.csproj" />
     <ProjectReference Include="..\..\src\Riskeer.Integration.Data\Riskeer.Integration.Data.csproj" />
     <ProjectReference Include="..\..\src\Riskeer.Integration.Forms\Riskeer.Integration.Forms.csproj" />
     <ProjectReference Include="..\..\src\Riskeer.Integration.IO\Riskeer.Integration.IO.csproj" />
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r54c889ff0f67cd16eb8371a7e9c468444a4732ba -r98cb2245bb3d098cf522b793b288ade596b7e3df
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 54c889ff0f67cd16eb8371a7e9c468444a4732ba)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 98cb2245bb3d098cf522b793b288ade596b7e3df)
@@ -38,6 +38,7 @@
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.ClosingStructures.Plugin;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
@@ -51,6 +52,10 @@
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Common.Forms.Views;
+using Riskeer.DuneErosion.Plugin;
+using Riskeer.GrassCoverErosionInwards.Plugin;
+using Riskeer.GrassCoverErosionOutwards.Plugin;
+using Riskeer.HeightStructures.Plugin;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.StandAlone;
 using Riskeer.Integration.Data.StandAlone.SectionResults;
@@ -60,6 +65,11 @@
 using Riskeer.Integration.Forms.PropertyClasses.StandAlone;
 using Riskeer.Integration.Forms.Views;
 using Riskeer.Integration.Forms.Views.SectionResultViews;
+using Riskeer.MacroStabilityInwards.Plugin;
+using Riskeer.Piping.Plugin;
+using Riskeer.StabilityPointStructures.Plugin;
+using Riskeer.StabilityStoneCover.Plugin;
+using Riskeer.WaveImpactAsphaltCover.Plugin;
 using RiskeerCommonServiceResources = Riskeer.Common.Service.Properties.Resources;
 
 namespace Riskeer.Integration.Plugin.Test
@@ -69,7 +79,7 @@
     {
         [Test]
         [Apartment(ApartmentState.STA)]
-        public void DefaultConstructor_ExpectedValues()
+        public void Constructor_ExpectedValues()
         {
             // Call
             using (var plugin = new RiskeerPlugin())
@@ -91,25 +101,22 @@
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings()))
             {
-                using (var plugin = new RiskeerPlugin())
-                {
-                    plugin.Gui = gui;
-                    gui.Run();
+                SetPlugins(gui);
+                gui.Run();
 
-                    var project = new RiskeerProject
+                var project = new RiskeerProject
+                {
+                    AssessmentSections =
                     {
-                        AssessmentSections =
-                        {
-                            new AssessmentSection(AssessmentSectionComposition.Dike)
-                        }
-                    };
+                        new AssessmentSection(AssessmentSectionComposition.Dike)
+                    }
+                };
 
-                    // When
-                    Action action = () => gui.SetProject(project, null);
+                // When
+                Action action = () => gui.SetProject(project, null);
 
-                    // Then
-                    TestHelper.AssertLogMessagesCount(action, 0);
-                }
+                // Then
+                TestHelper.AssertLogMessagesCount(action, 0);
             }
 
             mocks.VerifyAll();
@@ -131,34 +138,31 @@
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings()))
             {
-                using (var plugin = new RiskeerPlugin())
-                {
-                    plugin.Gui = gui;
-                    gui.Run();
+                SetPlugins(gui);
+                gui.Run();
 
-                    var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
+                var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
+                {
+                    HydraulicBoundaryDatabase =
                     {
-                        HydraulicBoundaryDatabase =
-                        {
-                            FilePath = testFilePath
-                        }
-                    };
-                    HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
+                        FilePath = testFilePath
+                    }
+                };
+                HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
 
-                    var project = new RiskeerProject
+                var project = new RiskeerProject
+                {
+                    AssessmentSections =
                     {
-                        AssessmentSections =
-                        {
-                            assessmentSection
-                        }
-                    };
+                        assessmentSection
+                    }
+                };
 
-                    // When
-                    Action action = () => gui.SetProject(project, null);
+                // When
+                Action action = () => gui.SetProject(project, null);
 
-                    // Then
-                    TestHelper.AssertLogMessagesCount(action, 0);
-                }
+                // Then
+                TestHelper.AssertLogMessagesCount(action, 0);
             }
 
             mocks.VerifyAll();
@@ -177,37 +181,34 @@
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings()))
             {
-                using (var plugin = new RiskeerPlugin())
-                {
-                    plugin.Gui = gui;
-                    gui.Run();
+                SetPlugins(gui);
+                gui.Run();
 
-                    const string nonExistingFile = "not_existing_file";
+                const string nonExistingFile = "not_existing_file";
 
-                    var project = new RiskeerProject
+                var project = new RiskeerProject
+                {
+                    AssessmentSections =
                     {
-                        AssessmentSections =
+                        new AssessmentSection(AssessmentSectionComposition.Dike)
                         {
-                            new AssessmentSection(AssessmentSectionComposition.Dike)
+                            HydraulicBoundaryDatabase =
                             {
-                                HydraulicBoundaryDatabase =
-                                {
-                                    FilePath = nonExistingFile
-                                }
+                                FilePath = nonExistingFile
                             }
                         }
-                    };
+                    }
+                };
 
-                    // When
-                    Action action = () => gui.SetProject(project, null);
+                // When
+                Action action = () => gui.SetProject(project, null);
 
-                    // Then
-                    string fileMissingMessage = $"Fout bij het lezen van bestand '{nonExistingFile}': het bestand bestaat niet.";
-                    string message = string.Format(
-                        RiskeerCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
-                        fileMissingMessage);
-                    TestHelper.AssertLogMessageWithLevelIsGenerated(action, Tuple.Create(message, LogLevelConstant.Warn));
-                }
+                // Then
+                string fileMissingMessage = $"Fout bij het lezen van bestand '{nonExistingFile}': het bestand bestaat niet.";
+                string message = string.Format(
+                    RiskeerCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
+                    fileMissingMessage);
+                TestHelper.AssertLogMessageWithLevelIsGenerated(action, Tuple.Create(message, LogLevelConstant.Warn));
             }
 
             mocks.VerifyAll();
@@ -743,5 +744,23 @@
                 Assert.Throws<InvalidOperationException>(test);
             }
         }
+
+        private static void SetPlugins(IPluginsHost gui)
+        {
+            gui.Plugins.AddRange(new PluginBase[]
+            {
+                new RiskeerPlugin(),
+                new ClosingStructuresPlugin(),
+                new StabilityPointStructuresPlugin(),
+                new WaveImpactAsphaltCoverPlugin(),
+                new GrassCoverErosionInwardsPlugin(),
+                new GrassCoverErosionOutwardsPlugin(),
+                new PipingPlugin(),
+                new HeightStructuresPlugin(),
+                new StabilityStoneCoverPlugin(),
+                new DuneErosionPlugin(),
+                new MacroStabilityInwardsPlugin()
+            });
+        }
     }
 }
\ No newline at end of file