Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rd7ddbdf7e550ba8a7c93fdbd740a84279598c68b -rad38998b8f64f90bca3a47390b64dbdebd8e67e6
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision d7ddbdf7e550ba8a7c93fdbd740a84279598c68b)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision ad38998b8f64f90bca3a47390b64dbdebd8e67e6)
@@ -94,6 +94,8 @@
             var expectedFailureProbabilityOpenStructure = ProbabilityFormattingHelper.Format(input.FailureProbabilityOpenStructure);
             var expectedFailureProbabilityReparation = ProbabilityFormattingHelper.Format(input.FailureProbabilityReparation);
 
+            Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
+            Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
             Assert.AreSame(input.InsideWaterLevel, properties.InsideWaterLevel.Data);
             Assert.AreEqual(input.InflowModelType, properties.InflowModelType);
             Assert.AreSame(input.AreaFlowApertures, properties.AreaFlowApertures.Data);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -rad38998b8f64f90bca3a47390b64dbdebd8e67e6
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision ad38998b8f64f90bca3a47390b64dbdebd8e67e6)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using System.ComponentModel;
 using Core.Common.Base;
 using Core.Common.Base.Data;
@@ -190,6 +191,38 @@
             mockRepository.VerifyAll();
         }
 
+        [Test]
+        public void GetAvailableHydraulicBoundaryLocations_InputWithLocations_ReturnsLocations()
+        {
+            // Setup
+            var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    new HydraulicBoundaryLocation(0, "", 1, 2)
+                }
+            };
+
+            mockRepository.ReplayAll();
+
+            var input = new GrassCoverErosionInwardsInput();
+            var calculation = new GrassCoverErosionInwardsCalculation();
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var properties = new GrassCoverErosionInwardsInputContextProperties
+            {
+                Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSectionStub)
+            };
+
+            // Call
+            var availableHydraulicBoundaryLocations = properties.GetAvailableHydraulicBoundaryLocations();
+
+            // Assert
+            List<HydraulicBoundaryLocation> expectedHydraulicBoundaryLocations = assessmentSectionStub.HydraulicBoundaryDatabase.Locations;
+            Assert.AreSame(expectedHydraulicBoundaryLocations, availableHydraulicBoundaryLocations);
+            mockRepository.VerifyAll();
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool withDikeProfile)
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rd7ddbdf7e550ba8a7c93fdbd740a84279598c68b -rad38998b8f64f90bca3a47390b64dbdebd8e67e6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision d7ddbdf7e550ba8a7c93fdbd740a84279598c68b)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision ad38998b8f64f90bca3a47390b64dbdebd8e67e6)
@@ -92,6 +92,8 @@
             var expectedFailureProbabilityRepairClosure = ProbabilityFormattingHelper.Format(input.FailureProbabilityRepairClosure);
             var expectedProbabilityCollisionSecondaryStructure = ProbabilityFormattingHelper.Format(input.ProbabilityCollisionSecondaryStructure);
 
+            Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
+            Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
             Assert.AreEqual(input.VolumicWeightWater, properties.VolumicWeightWater);
             Assert.AreSame(input.InsideWaterLevelFailureConstruction, properties.InsideWaterLevelFailureConstruction.Data);
             Assert.AreSame(input.InsideWaterLevel, properties.InsideWaterLevel.Data);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -rad38998b8f64f90bca3a47390b64dbdebd8e67e6
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs)	(revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs)	(revision ad38998b8f64f90bca3a47390b64dbdebd8e67e6)
@@ -54,6 +54,9 @@
             // Assert
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
+            Assert.AreEqual(failureMechanism.GeneralInput.A, properties.A);
+            Assert.AreEqual(failureMechanism.GeneralInput.B, properties.B);
+            Assert.AreEqual(failureMechanism.GeneralInput.C, properties.C);
         }
 
         [Test]