Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r93242409654d795796d14bc0d0fc640113b249d1 -rf05ca3345e173bcdd462ca8ea4b6f12b2de86e2c
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision 93242409654d795796d14bc0d0fc640113b249d1)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision f05ca3345e173bcdd462ca8ea4b6f12b2de86e2c)
@@ -38,6 +38,7 @@
 using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.ClosingStructures.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.PropertyClasses
@@ -113,8 +114,22 @@
 
             // Assert
             ClosingStructuresInput input = calculation.InputParameters;
+            var expectedProbabilityOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(input.ProbabilityOpenStructureBeforeFlooding);
+            var expectedFailureProbabilityOpenStructure = ProbabilityFormattingHelper.Format(input.FailureProbabilityOpenStructure);
+            var expectedFailureProbabilityReparation = ProbabilityFormattingHelper.Format(input.FailureProbabilityReparation);
 
             Assert.AreEqual(input.DeviationWaveDirection, properties.DeviationWaveDirection);
+            Assert.AreSame(input.InsideWaterLevel, properties.InsideWaterLevel.Data);
+            Assert.AreEqual(input.InflowModelType, properties.InflowModelType);
+            Assert.AreSame(input.AreaFlowApertures, properties.AreaFlowApertures.Data);
+            Assert.AreEqual(input.IdenticalApertures, properties.IdenticalApertures);
+            Assert.AreSame(input.LevelCrestStructureNotClosing, properties.LevelCrestStructureNotClosing.Data);
+            Assert.AreSame(input.ThresholdHeightOpenWeir, properties.ThresholdHeightOpenWeir.Data);
+            Assert.AreEqual(expectedProbabilityOpenStructureBeforeFlooding, properties.ProbabilityOpenStructureBeforeFlooding);
+            Assert.AreEqual(expectedFailureProbabilityOpenStructure, properties.FailureProbabilityOpenStructure);
+            Assert.AreEqual(expectedFailureProbabilityReparation, properties.FailureProbabilityReparation);
+            Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data);
+            Assert.AreEqual(input.FactorStormDurationOpenStructure, properties.FactorStormDurationOpenStructure);
 
             mockRepository.VerifyAll();
         }
@@ -168,11 +183,13 @@
             ClosingStructuresInput input = calculation.InputParameters;
             Assert.AreEqual(input.DeviationWaveDirection, properties.DeviationWaveDirection);
 
-            Assert.AreEqual(1, properties.GetAvailableHydraulicBoundaryLocations().Count());
-            CollectionAssert.AreEqual(inputContext.AvailableHydraulicBoundaryLocations, properties.GetAvailableHydraulicBoundaryLocations());
+            var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles().ToArray();
+            Assert.AreEqual(1, availableForeshoreProfiles.Length);
+            CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles);
 
-            Assert.AreEqual(1, properties.GetAvailableStructures().Count());
-            CollectionAssert.AreEqual(failureMechanism.ClosingStructures, properties.GetAvailableStructures());
+            var availableStructures = properties.GetAvailableStructures().ToArray();
+            Assert.AreEqual(1, availableStructures.Length);
+            CollectionAssert.AreEqual(failureMechanism.ClosingStructures, availableStructures);
 
             mockRepository.VerifyAll();
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -r08db9d0ea01aefe9fd1f06e31439b23ec84e482f -rf05ca3345e173bcdd462ca8ea4b6f12b2de86e2c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision 08db9d0ea01aefe9fd1f06e31439b23ec84e482f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision f05ca3345e173bcdd462ca8ea4b6f12b2de86e2c)
@@ -178,8 +178,9 @@
             Assert.AreSame(input.HydraulicBoundaryLocation, properties.HydraulicBoundaryLocation);
             Assert.AreSame(input.StormDuration, properties.StormDuration.Data);
 
-            Assert.AreEqual(1, properties.GetAvailableHydraulicBoundaryLocations().Count());
-            CollectionAssert.AreEqual(inputContext.AvailableHydraulicBoundaryLocations, properties.GetAvailableHydraulicBoundaryLocations());
+            var availableHydraulicBoundaryLocations = properties.GetAvailableHydraulicBoundaryLocations().ToArray();
+            Assert.AreEqual(1, availableHydraulicBoundaryLocations.Length);
+            CollectionAssert.AreEqual(inputContext.AvailableHydraulicBoundaryLocations, availableHydraulicBoundaryLocations);
 
             mockRepository.VerifyAll();
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r93242409654d795796d14bc0d0fc640113b249d1 -rf05ca3345e173bcdd462ca8ea4b6f12b2de86e2c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 93242409654d795796d14bc0d0fc640113b249d1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision f05ca3345e173bcdd462ca8ea4b6f12b2de86e2c)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using Application.Ringtoets.Storage.TestUtil;
@@ -160,11 +161,13 @@
             Assert.AreSame(input.LevelCrestStructure, properties.LevelCrestStructure.Data);
             Assert.AreEqual(input.DeviationWaveDirection, properties.DeviationWaveDirection);
 
-            Assert.AreEqual(1, properties.GetAvailableHydraulicBoundaryLocations().Count());
-            CollectionAssert.AreEqual(inputContext.AvailableHydraulicBoundaryLocations, properties.GetAvailableHydraulicBoundaryLocations());
+            var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles().ToArray();
+            Assert.AreEqual(1, availableForeshoreProfiles.Length);
+            CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles);
 
-            Assert.AreEqual(1, properties.GetAvailableStructures().Count());
-            CollectionAssert.AreEqual(failureMechanism.HeightStructures, properties.GetAvailableStructures());
+            var availableStructures = properties.GetAvailableStructures().ToArray();
+            Assert.AreEqual(1, availableStructures.Length);
+            CollectionAssert.AreEqual(failureMechanism.HeightStructures, availableStructures);
 
             mockRepository.VerifyAll();
         }