Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r5cb5707e72014afb2b2bc5a015bf3bd507242318 -r2d104a54ab378eea92fd946b40cff2bd79ca39b0
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision 5cb5707e72014afb2b2bc5a015bf3bd507242318)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision 2d104a54ab378eea92fd946b40cff2bd79ca39b0)
@@ -40,6 +40,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
+using Ringtoets.Common.Forms.TypeConverters;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.PropertyClasses
 {
@@ -101,7 +102,7 @@
         }
 
         [Test]
-        public void Constructor_WithDataAndHandler_ExpectedValues()
+        public void Constructor_ValidData_ExpectedValues()
         {
             // Setup
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
@@ -144,6 +145,18 @@
             Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data);
             Assert.AreEqual(input.FactorStormDurationOpenStructure, properties.FactorStormDurationOpenStructure);
 
+            TestHelper.AssertTypeConverter<ClosingStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(ClosingStructuresInputContextProperties.FailureProbabilityStructureWithErosion));
+
+            TestHelper.AssertTypeConverter<ClosingStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(ClosingStructuresInputContextProperties.FailureProbabilityOpenStructure));
+
+            TestHelper.AssertTypeConverter<ClosingStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(ClosingStructuresInputContextProperties.ProbabilityOrFrequencyOpenStructureBeforeFlooding));
+
+            TestHelper.AssertTypeConverter<ClosingStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(ClosingStructuresInputContextProperties.FailureProbabilityReparation));
+
             mockRepository.VerifyAll();
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoProbabilityValueDoubleConverter.cs
===================================================================
diff -u -r5cb5707e72014afb2b2bc5a015bf3bd507242318 -r2d104a54ab378eea92fd946b40cff2bd79ca39b0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoProbabilityValueDoubleConverter.cs	(.../NoProbabilityValueDoubleConverter.cs)	(revision 5cb5707e72014afb2b2bc5a015bf3bd507242318)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoProbabilityValueDoubleConverter.cs	(.../NoProbabilityValueDoubleConverter.cs)	(revision 2d104a54ab378eea92fd946b40cff2bd79ca39b0)
@@ -36,6 +36,8 @@
     /// </summary>
     public class NoProbabilityValueDoubleConverter : TypeConverter
     {
+        private const string returnPeriodNotation = "1/";
+
         public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
         {
             var doubleValue = (double) value;
@@ -71,7 +73,7 @@
 
                 try
                 {
-                    if (text.StartsWith("1/"))
+                    if (text.StartsWith(returnPeriodNotation))
                     {
                         return 1 / Convert.ToDouble(text.Substring(2));
                     }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionResultRow.cs
===================================================================
diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -r2d104a54ab378eea92fd946b40cff2bd79ca39b0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionResultRow.cs	(.../FailureMechanismSectionResultRow.cs)	(revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionResultRow.cs	(.../FailureMechanismSectionResultRow.cs)	(revision 2d104a54ab378eea92fd946b40cff2bd79ca39b0)
@@ -20,10 +20,7 @@
 // All rights reserved.
 
 using System;
-using System.ComponentModel;
-using Core.Common.Base.Data;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.TypeConverters;
 
 namespace Ringtoets.Common.Forms.Views
 {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc -r2d104a54ab378eea92fd946b40cff2bd79ca39b0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 2d104a54ab378eea92fd946b40cff2bd79ca39b0)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
+using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -112,7 +113,7 @@
         }
 
         [Test]
-        public void Constructor_WithDataAndHandler_ExpectedValues()
+        public void Constructor_ValidData_ExpectedValues()
         {
             // Setup
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
@@ -130,12 +131,16 @@
             var properties = new HeightStructuresInputContextProperties(inputContext, handler);
 
             // Assert
-            Assert.IsInstanceOf<StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(properties);
+            Assert.IsInstanceOf<StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, StructuresCalculation<HeightStructuresInput>,
+                HeightStructuresFailureMechanism>>(properties);
             Assert.AreSame(inputContext, properties.Data);
 
             HeightStructuresInput input = calculation.InputParameters;
             Assert.AreSame(input.LevelCrestStructure, properties.LevelCrestStructure.Data);
 
+            TestHelper.AssertTypeConverter<HeightStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(HeightStructuresInputContextProperties.FailureProbabilityStructureWithErosion));
+
             mockRepository.VerifyAll();
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesTest.cs
===================================================================
diff -u -r5cb5707e72014afb2b2bc5a015bf3bd507242318 -r2d104a54ab378eea92fd946b40cff2bd79ca39b0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesTest.cs	(.../FailureMechanismContributionPropertiesTest.cs)	(revision 5cb5707e72014afb2b2bc5a015bf3bd507242318)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesTest.cs	(.../FailureMechanismContributionPropertiesTest.cs)	(revision 2d104a54ab378eea92fd946b40cff2bd79ca39b0)
@@ -34,6 +34,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
+using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.Plugin.Handlers;
@@ -139,7 +140,7 @@
         }
 
         [Test]
-        public void Constructor_WithValidParameters_DataSet()
+        public void Constructor_ValidData_ExpectedValues()
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -161,6 +162,33 @@
             Assert.IsInstanceOf<ObjectProperties<FailureMechanismContribution>>(properties);
             Assert.AreSame(failureMechanismContribution, properties.Data);
 
+            TestHelper.AssertTypeConverter<FailureMechanismContributionProperties, NoProbabilityValueDoubleConverter>(
+                nameof(FailureMechanismContributionProperties.SignalingNorm));
+
+            TestHelper.AssertTypeConverter<FailureMechanismContributionProperties, NoProbabilityValueDoubleConverter>(
+                nameof(FailureMechanismContributionProperties.LowerLimitNorm));
+        }
+
+        [Test]
+        public void Constructor_WithValidParameters_DataSet()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            var failureMechanismChangeHandler = mockRepository.Stub<IObservablePropertyChangeHandler>();
+            var assessmentSectionChangeHandler = mockRepository.Stub<IAssessmentSectionCompositionChangeHandler>();
+            mockRepository.ReplayAll();
+
+            FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution();
+
+            // Call
+            var properties = new FailureMechanismContributionProperties(
+                failureMechanismContribution,
+                assessmentSection,
+                failureMechanismChangeHandler,
+                assessmentSectionChangeHandler);
+
+            // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
 
             Assert.AreEqual(4, dynamicProperties.Count);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r5cb5707e72014afb2b2bc5a015bf3bd507242318 -r2d104a54ab378eea92fd946b40cff2bd79ca39b0
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision 5cb5707e72014afb2b2bc5a015bf3bd507242318)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision 2d104a54ab378eea92fd946b40cff2bd79ca39b0)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
+using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
@@ -151,6 +152,15 @@
             Assert.AreEqual(input.EvaluationLevel, properties.EvaluationLevel);
             Assert.AreEqual(input.VerticalDistance, properties.VerticalDistance);
 
+            TestHelper.AssertTypeConverter<StabilityPointStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(StabilityPointStructuresInputContextProperties.FailureProbabilityStructureWithErosion));
+
+            TestHelper.AssertTypeConverter<StabilityPointStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(StabilityPointStructuresInputContextProperties.FailureProbabilityRepairClosure));
+
+            TestHelper.AssertTypeConverter<StabilityPointStructuresInputContextProperties, NoProbabilityValueDoubleConverter>(
+                nameof(StabilityPointStructuresInputContextProperties.ProbabilityCollisionSecondaryStructure));
+
             mockRepository.VerifyAll();
         }