Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r5c16cc90e42323664f18ca352a0e43ac9bd73b35
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 5c16cc90e42323664f18ca352a0e43ac9bd73b35)
@@ -30,6 +30,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.UITypeEditors;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses;
@@ -66,6 +67,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<GrassCoverErosionInwardsInputContext>>(properties);
+            Assert.IsInstanceOf<IHasHydraulicBoundaryLocationProperty>(properties);
             Assert.IsNull(properties.Data);
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r5c16cc90e42323664f18ca352a0e43ac9bd73b35
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 5c16cc90e42323664f18ca352a0e43ac9bd73b35)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.UITypeEditors;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -81,6 +82,9 @@
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<HeightStructuresInputContext>>(properties);
+            Assert.IsInstanceOf<IHasStructureProperty<HeightStructure>>(properties);
+            Assert.IsInstanceOf<IHasForeshoreProfileProperty>(properties);
+            Assert.IsInstanceOf<IHasHydraulicBoundaryLocationProperty>(properties);
             Assert.IsNull(properties.Data);
         }
 
@@ -104,7 +108,7 @@
             HeightStructuresInput input = calculation.InputParameters;
             var expectedFailureProbabilityStructureWithErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityStructureWithErosion);
 
-            Assert.IsNull(properties.HeightStructure);
+            Assert.IsNull(properties.Structure);
             Assert.IsNull(properties.HeightStructureLocation);
             Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
             Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
@@ -174,7 +178,7 @@
             var expectedHeightStructureLocation = new Point2D(new RoundedDouble(0, input.Structure.Location.X), new RoundedDouble(0, input.Structure.Location.Y));
             var expectedFailureProbabilityStructureWithErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityStructureWithErosion);
 
-            Assert.AreSame(input.Structure, properties.HeightStructure);
+            Assert.AreSame(input.Structure, properties.Structure);
             Assert.AreEqual(expectedHeightStructureLocation, properties.HeightStructureLocation);
             Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
             Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
@@ -195,8 +199,8 @@
             Assert.AreEqual(1, properties.GetAvailableHydraulicBoundaryLocations().Count());
             CollectionAssert.AreEqual(inputContext.AvailableHydraulicBoundaryLocations, properties.GetAvailableHydraulicBoundaryLocations());
 
-            Assert.AreEqual(1, properties.GetAvailableHeightStructures().Count());
-            CollectionAssert.AreEqual(failureMechanism.HeightStructures, properties.GetAvailableHeightStructures());
+            Assert.AreEqual(1, properties.GetAvailableStructures().Count());
+            CollectionAssert.AreEqual(failureMechanism.HeightStructures, properties.GetAvailableStructures());
 
             Assert.AreEqual(1, properties.GetAvailableForeshoreProfiles().Count());
             CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, properties.GetAvailableForeshoreProfiles());
@@ -232,15 +236,15 @@
             double newDeviationWaveDirection = random.NextDouble();
 
             // Call
-            properties.HeightStructure = newHeightStructure;
+            properties.Structure = newHeightStructure;
             properties.StructureNormalOrientation = (RoundedDouble) newStructureNormalOrientation;
             properties.FailureProbabilityStructureWithErosion = "1e-2";
             properties.HydraulicBoundaryLocation = hydraulicBoundaryLocation;
             properties.ForeshoreProfile = newForeshoreProfile;
             properties.DeviationWaveDirection = (RoundedDouble) newDeviationWaveDirection;
 
             // Assert
-            Assert.AreSame(newHeightStructure, properties.HeightStructure);
+            Assert.AreSame(newHeightStructure, properties.Structure);
             Assert.AreEqual(newStructureNormalOrientation, properties.StructureNormalOrientation,
                             properties.StructureNormalOrientation.GetAccuracy());
             Assert.AreEqual(0.01, input.FailureProbabilityStructureWithErosion);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r5c16cc90e42323664f18ca352a0e43ac9bd73b35
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 5c16cc90e42323664f18ca352a0e43ac9bd73b35)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.UITypeEditors;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -54,6 +55,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<PipingInputContext>>(properties);
+            Assert.IsInstanceOf<IHasHydraulicBoundaryLocationProperty>(properties);
             Assert.IsNull(properties.Data);
         }
 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r5c16cc90e42323664f18ca352a0e43ac9bd73b35
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 5c16cc90e42323664f18ca352a0e43ac9bd73b35)
@@ -34,6 +34,7 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.UITypeEditors;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
@@ -69,7 +70,8 @@
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<WaveConditionsInputContext>>(properties);
-            Assert.IsInstanceOf<IWaveConditionsInputContextProperties<WaveConditionsInputContext>>(properties);
+            Assert.IsInstanceOf<IHasHydraulicBoundaryLocationProperty>(properties);
+            Assert.IsInstanceOf<IHasForeshoreProfileProperty>(properties);
             Assert.IsNull(properties.Data);
         }
 
@@ -141,7 +143,7 @@
             {
                 DesignWaterLevel = assessmentLevel
             };
-            var input = new WaveConditionsInput()
+            var input = new WaveConditionsInput
             {
                 ForeshoreProfile = foreshoreProfile,
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation,