Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
@@ -24,6 +24,7 @@
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Probability;
@@ -60,14 +61,14 @@
 
                 // assert
                 Assert.AreEqual(2, propertyInfos.Length);
-                var failureMechanismContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(HeightStructuresFailureMechanismContext));
-                Assert.AreEqual(typeof(HeightStructuresFailureMechanismContextProperties), failureMechanismContextProperties.PropertyObjectType);
+                var failureMechanismContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                    <HeightStructuresFailureMechanismContext, HeightStructuresFailureMechanismContextProperties>(propertyInfos);
                 Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck);
                 Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(failureMechanismContextProperties.AfterCreate);
 
-                var heightStructuresInputContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(HeightStructuresInputContext));
-                Assert.AreEqual(typeof(HeightStructuresInputContextProperties), heightStructuresInputContextProperties.PropertyObjectType);
+                var heightStructuresInputContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                    <HeightStructuresInputContext, HeightStructuresInputContextProperties>(propertyInfos);
                 Assert.IsNull(heightStructuresInputContextProperties.AdditionalDataCheck);
                 Assert.IsNull(heightStructuresInputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(heightStructuresInputContextProperties.AfterCreate);