Index: Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs	(.../PropertyInfoTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs	(.../PropertyInfoTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -48,7 +48,6 @@
 
             var newDataType = typeof(object);
             var newPropertyObjectType = typeof(TestObjectProperties);
-            Func<object, bool> newAdditionalDataDelegate = o => true;
 
             // Call
             info.DataType = newDataType;
@@ -99,16 +98,13 @@
             // Assert
             Assert.IsNotNull(properties);
         }
-
+        
         [Test]
-        public void ImplicitOperator_OptionalDelegatesSet_PropertyInfoFullyConverted()
+        public void ImplicitOperator_Always_PropertyInfoFullyConverted()
         {
             // Setup
             var info = new PropertyInfo<int, TestObjectProperties>();
 
-            const int inputData = 42;
-            var testProperties = new TestObjectProperties();
-
             // Precondition
             Assert.IsInstanceOf<PropertyInfo<int, TestObjectProperties>>(info);
 
@@ -121,24 +117,6 @@
             Assert.AreEqual(typeof(TestObjectProperties), convertedInfo.PropertyObjectType);
         }
 
-        [Test]
-        public void ImplicitOperator_NoneOfTheOptionalDelegatesSet_PropertyInfoFullyConverted()
-        {
-            // Setup
-            var info = new PropertyInfo<int, TestObjectProperties>();
-
-            // Precondition
-            Assert.IsInstanceOf<PropertyInfo<int, TestObjectProperties>>(info);
-
-            // Call
-            PropertyInfo convertedInfo = info;
-
-            // Assert
-            Assert.IsInstanceOf<PropertyInfo>(convertedInfo);
-            Assert.AreEqual(typeof(int), convertedInfo.DataType);
-            Assert.AreEqual(typeof(TestObjectProperties), convertedInfo.PropertyObjectType);
-        }
-
         private class TestObjectProperties : ObjectProperties<object> {}
     }
 }
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs	(.../MapPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs	(.../MapPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -123,22 +123,22 @@
                 // Assert
                 Assert.AreEqual(4, propertyInfos.Length);
 
-                PropertyInfo mapDataCollectionPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapDataCollection),
                     typeof(MapDataCollectionProperties));
 
-                PropertyInfo mapPointDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapPointData),
                     typeof(MapPointDataProperties));
 
-                PropertyInfo mapLineDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapLineData),
                     typeof(MapLineDataProperties));
 
-                PropertyInfo mapPolygonDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapPolygonData),
                     typeof(MapPolygonDataProperties));
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -25,15 +25,12 @@
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.ClosingStructures.Forms.PropertyClasses;
 using Ringtoets.ClosingStructures.Forms.Views;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.PresentationObjects;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Plugin.Test
 {
@@ -55,10 +52,6 @@
         public void GetPropertyInfos_ReturnsSupportedPropertyClassesWithExpectedValues()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
             using (var plugin = new ClosingStructuresPlugin())
             {
                 // Call
@@ -67,24 +60,21 @@
                 // Assert
                 Assert.AreEqual(3, propertyInfos.Length);
 
-                var failureMechanism = new ClosingStructuresFailureMechanism();
-                var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection);
-                PropertyInfo closingStructuresFailureMechanismContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ClosingStructuresFailureMechanismContext),
                     typeof(ClosingStructureFailureMechanismProperties));
 
-                PropertyInfo closingStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ClosingStructure),
                     typeof(ClosingStructureProperties));
 
-                PropertyInfo closingStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ClosingStructuresInputContext),
                     typeof(ClosingStructuresInputContextProperties));
             }
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs	(.../GrassCoverErosionInwardsPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs	(.../GrassCoverErosionInwardsPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -59,22 +59,22 @@
                 // Assert
                 Assert.AreEqual(4, propertyInfos.Length);
 
-                PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionInwardsFailureMechanismContext),
                     typeof(GrassCoverErosionInwardsFailureMechanismContextProperties));
 
-                PropertyInfo dikeProfileProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DikeProfile),
                     typeof(DikeProfileProperties));
 
-                PropertyInfo inputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionInwardsInputContext),
                     typeof(GrassCoverErosionInwardsInputContextProperties));
 
-                PropertyInfo outputProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionInwardsOutput),
                     typeof(GrassCoverErosionInwardsOutputProperties));
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -32,7 +32,6 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test
 {
@@ -123,37 +122,37 @@
                 // Assert
                 Assert.AreEqual(7, propertyInfos.Length);
 
-                PropertyInfo grassCoverErosionOutwardsFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsFailureMechanismContext),
                     typeof(GrassCoverErosionOutwardsFailureMechanismProperties));
 
-                var waterLevelHydraulicBoundaryLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContext),
                     typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContextProperties));
 
-                var waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext),
                     typeof(GrassCoverErosionOutwardsWaveHeightLocationsContextProperties));
 
-                var grassCoverErosionWaveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsWaveConditionsOutput),
                     typeof(GrassCoverErosionOutwardsWaveConditionsOutputProperties));
 
-                var grassCoverErosionWaveConditionsInputContextroperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsWaveConditionsInputContext),
                     typeof(GrassCoverErosionOutwardsWaveConditionsInputContextProperties));
 
-                var grassCoverErosionDesignWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationContext),
                     typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties));
 
-                var grasCoverErosionWaveHeightWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsWaveHeightLocationContext),
                     typeof(GrassCoverErosionOutwardsWaveHeightLocationContextProperties));
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -28,7 +28,6 @@
 using Core.Common.Gui.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
@@ -56,10 +55,6 @@
         public void GetPropertyInfos_ReturnsSupportedPropertyClassesWithExpectedValues()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
             using (var plugin = new HeightStructuresPlugin())
             {
                 // Call
@@ -68,24 +63,21 @@
                 // Assert
                 Assert.AreEqual(3, propertyInfos.Length);
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
-                var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
-                PropertyInfo heightStructuresFailureMechanismContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HeightStructuresFailureMechanismContext),
                     typeof(HeightStructuresFailureMechanismProperties));
 
-                PropertyInfo heightStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HeightStructure),
                     typeof(HeightStructureProperties));
 
-                PropertyInfo heightStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HeightStructuresInputContext),
                     typeof(HeightStructuresInputContextProperties));
             }
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -55,8 +55,6 @@
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.Views;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
-using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test
@@ -202,67 +200,67 @@
                 // Assert
                 Assert.AreEqual(13, propertyInfos.Length);
 
-                PropertyInfo ringtoetsProjectProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(IProject),
                     typeof(RingtoetsProjectProperties));
 
-                PropertyInfo assessmentSectionProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(IAssessmentSection),
                     typeof(AssessmentSectionProperties));
 
-                PropertyInfo hydraulicBoundaryDatabaseProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HydraulicBoundaryDatabaseContext),
                     typeof(HydraulicBoundaryDatabaseProperties));
 
-                PropertyInfo failureMechanismContributionProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(FailureMechanismContributionContext),
                     typeof(FailureMechanismContributionProperties));
 
-                PropertyInfo standAloneFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(FailureMechanismContext<IFailureMechanism>),
                     typeof(StandAloneFailureMechanismContextProperties));
 
-                PropertyInfo calculationGroupProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ICalculationContext<CalculationGroup, IFailureMechanism>),
                     typeof(CalculationGroupContextProperties));
 
-                PropertyInfo calculationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ICalculationContext<ICalculation, IFailureMechanism>),
                     typeof(CalculationContextProperties));
 
-                PropertyInfo outputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ProbabilityAssessmentOutput),
                     typeof(ProbabilityAssessmentOutputProperties));
 
-                PropertyInfo designWaterLevelLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DesignWaterLevelLocationsContext),
                     typeof(DesignWaterLevelLocationsContextProperties));
 
-                PropertyInfo designWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DesignWaterLevelLocationContext),
                     typeof(DesignWaterLevelLocationContextProperties));
 
-                PropertyInfo waveHeightLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveHeightLocationsContext),
                     typeof(WaveHeightLocationsContextProperties));
 
-                PropertyInfo waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveHeightLocationContext),
                     typeof(WaveHeightLocationContextProperties));
 
-                PropertyInfo foreshoreProfileProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ForeshoreProfile),
                     typeof(ForeshoreProfileProperties));
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -34,8 +34,6 @@
 using Ringtoets.Piping.Forms.PropertyClasses;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
-using PipingPluginResources = Ringtoets.Piping.Plugin.Properties.Resources;
-using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test
 {
@@ -70,32 +68,32 @@
                 // Assert
                 Assert.AreEqual(6, propertyInfos.Length);
 
-                PropertyInfo pipingFailureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(PipingFailureMechanismContext),
                     typeof(PipingFailureMechanismContextProperties));
 
-                PropertyInfo pipingInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(PipingInputContext),
                     typeof(PipingInputContextProperties));
 
-                PropertyInfo pipingOutputProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(PipingOutputContext),
                     typeof(PipingOutputContextProperties));
 
-                PropertyInfo pipingSurfaceLineProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(RingtoetsPipingSurfaceLine),
                     typeof(RingtoetsPipingSurfaceLineProperties));
 
-                PropertyInfo stochasticSoilModelProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StochasticSoilModel),
                     typeof(StochasticSoilModelProperties));
 
-                PropertyInfo stochasticSoilProfileProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StochasticSoilProfile),
                     typeof(StochasticSoilProfileProperties));
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -34,7 +34,6 @@
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Forms.PropertyClasses;
 using Ringtoets.StabilityPointStructures.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.StabilityPointStructures.Plugin.Test
 {
@@ -64,17 +63,17 @@
                 // Assert
                 Assert.AreEqual(3, propertyInfos.Length);
 
-                PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityPointStructuresFailureMechanismContext),
                     typeof(StabilityPointStructuresFailureMechanismProperties));
 
-                PropertyInfo stabilityPointStructureProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityPointStructure),
                     typeof(StabilityPointStructureProperties));
 
-                PropertyInfo stabilityPointStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityPointStructuresInputContext),
                     typeof(StabilityPointStructuresInputContextProperties));
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -30,7 +30,6 @@
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
 using Ringtoets.StabilityStoneCover.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Plugin.Test
 {
@@ -49,15 +48,15 @@
                 // Assert
                 Assert.AreEqual(3, propertyInfos.Length);
 
-                PropertyInfo failureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityStoneCoverFailureMechanismContext),
                     typeof(StabilityStoneCoverFailureMechanismProperties));
-                PropertyInfo waveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityStoneCoverWaveConditionsOutput),
                     typeof(StabilityStoneCoverWaveConditionsOutputProperties));
-                PropertyInfo waveConditionsInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityStoneCoverWaveConditionsInputContext),
                     typeof(StabilityStoneCoverWaveConditionsInputContextProperties));
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -rbcb6b2364bcd2796869223db9942d3338b0f577a -r6e56258ed65fb071d7dac5a9df4e71196542a392
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision bcb6b2364bcd2796869223db9942d3338b0f577a)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 6e56258ed65fb071d7dac5a9df4e71196542a392)
@@ -30,7 +30,6 @@
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses;
 using Ringtoets.WaveImpactAsphaltCover.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Plugin.Test
 {
@@ -60,17 +59,17 @@
                 // Assert
                 Assert.AreEqual(3, propertyInfos.Length);
 
-                PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveImpactAsphaltCoverFailureMechanismContext),
                     typeof(WaveImpactAsphaltCoverFailureMechanismProperties));
 
-                PropertyInfo waveImpactAsphaltCoverWaveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveImpactAsphaltCoverWaveConditionsOutput),
                     typeof(WaveImpactAsphaltCoverWaveConditionsOutputProperties));
 
-                PropertyInfo waveConditionsInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveImpactAsphaltCoverWaveConditionsInputContext),
                     typeof(WaveImpactAsphaltCoverWaveConditionsInputContextProperties));