Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rcad219225ee11e816a86a0763d7b888a4d49d8a0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision cad219225ee11e816a86a0763d7b888a4d49d8a0)
@@ -81,10 +81,7 @@
             var properties = new HeightStructuresInputContextProperties();
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<HeightStructuresInputContext>>(properties);
-            Assert.IsInstanceOf<IHasStructureProperty<HeightStructure>>(properties);
-            Assert.IsInstanceOf<IHasForeshoreProfileProperty>(properties);
-            Assert.IsInstanceOf<IHasHydraulicBoundaryLocationProperty>(properties);
+            Assert.IsInstanceOf<StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, HeightStructuresCalculation, HeightStructuresFailureMechanism>>(properties);
             Assert.IsNull(properties.Data);
         }
 
@@ -109,7 +106,7 @@
             var expectedFailureProbabilityStructureWithErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityStructureWithErosion);
 
             Assert.IsNull(properties.Structure);
-            Assert.IsNull(properties.HeightStructureLocation);
+            Assert.IsNull(properties.StructureLocation);
             Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
             Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
             Assert.AreSame(input.LevelCrestStructure, properties.LevelCrestStructure.Data);
@@ -179,7 +176,7 @@
             var expectedFailureProbabilityStructureWithErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityStructureWithErosion);
 
             Assert.AreSame(input.Structure, properties.Structure);
-            Assert.AreEqual(expectedHeightStructureLocation, properties.HeightStructureLocation);
+            Assert.AreEqual(expectedHeightStructureLocation, properties.StructureLocation);
             Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
             Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
             Assert.AreSame(input.LevelCrestStructure, properties.LevelCrestStructure.Data);