Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationCreateExtensionsTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationCreateExtensionsTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -277,9 +277,9 @@
         private static void AssertHydraulicBoundaryLocationOutput(HydraulicBoundaryLocationOutput output, IHydraulicLocationOutputEntity entity)
         {
             Assert.AreEqual(output.Result, entity.Result, output.Result.GetAccuracy());
-            Assert.AreEqual(output.TargetProbability, entity.TargetProbability, output.TargetProbability.GetAccuracy());
+            Assert.AreEqual(output.TargetProbability, entity.TargetProbability, output.TargetProbability);
             Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability, output.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability, output.CalculatedProbability);
             Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual(output.CalculationConvergence, (CalculationConvergence) entity.CalculationConvergence);
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -50,9 +50,9 @@
             Assert.IsNotNull(entity);
             Assert.AreEqual((byte) outputType, entity.HydraulicLocationOutputType);
             Assert.AreEqual(output.Result, entity.Result, output.Result.GetAccuracy());
-            Assert.AreEqual(output.TargetProbability, entity.TargetProbability, output.TargetProbability.GetAccuracy());
+            Assert.AreEqual(output.TargetProbability, entity.TargetProbability);
             Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability, output.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability);
             Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
         }
@@ -100,9 +100,9 @@
             Assert.IsNotNull(entity);
             Assert.AreEqual((byte) outputType, entity.HydraulicLocationOutputType);
             Assert.AreEqual(output.Result, entity.Result, output.Result.GetAccuracy());
-            Assert.AreEqual(output.TargetProbability, entity.TargetProbability, output.TargetProbability.GetAccuracy());
+            Assert.AreEqual(output.TargetProbability, entity.TargetProbability);
             Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability, output.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability);
             Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -162,11 +162,11 @@
             Assert.IsNotNull(expected.TargetReliability);
             Assert.AreEqual((RoundedDouble) expected.TargetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
             Assert.IsNotNull(expected.TargetProbability);
-            Assert.AreEqual((RoundedDouble) expected.TargetProbability, actual.TargetProbability, actual.TargetProbability.GetAccuracy());
+            Assert.AreEqual(expected.TargetProbability, actual.TargetProbability);
             Assert.IsNotNull(expected.CalculatedReliability);
             Assert.AreEqual((RoundedDouble) expected.CalculatedReliability, actual.CalculatedReliability, actual.CalculatedReliability.GetAccuracy());
             Assert.IsNotNull(expected.CalculatedProbability);
-            Assert.AreEqual((RoundedDouble) expected.CalculatedProbability, actual.CalculatedProbability, actual.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual( expected.CalculatedProbability, actual.CalculatedProbability);
             Assert.AreEqual((CalculationConvergence) expected.CalculationConvergence, actual.CalculationConvergence);
         }
     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -160,11 +160,11 @@
             Assert.IsNotNull(expected.TargetReliability);
             Assert.AreEqual((RoundedDouble) expected.TargetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
             Assert.IsNotNull(expected.TargetProbability);
-            Assert.AreEqual((RoundedDouble) expected.TargetProbability, actual.TargetProbability, actual.TargetProbability.GetAccuracy());
+            Assert.AreEqual(expected.TargetProbability, actual.TargetProbability);
             Assert.IsNotNull(expected.CalculatedReliability);
             Assert.AreEqual((RoundedDouble) expected.CalculatedReliability, actual.CalculatedReliability, actual.CalculatedReliability.GetAccuracy());
             Assert.IsNotNull(expected.CalculatedProbability);
-            Assert.AreEqual((RoundedDouble) expected.CalculatedProbability, actual.CalculatedProbability, actual.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(expected.CalculatedProbability, actual.CalculatedProbability);
             Assert.AreEqual((CalculationConvergence) expected.CalculationConvergence, actual.CalculationConvergence);
         }
     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs	(.../IHydraulicLocationOutputEntityReadExtensionsTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs	(.../IHydraulicLocationOutputEntityReadExtensionsTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -61,9 +61,9 @@
 
             // Assert
             Assert.AreEqual((RoundedDouble) result, output.Result, output.Result.GetAccuracy());
-            Assert.AreEqual((RoundedDouble) targetProbability, output.TargetProbability, output.TargetProbability.GetAccuracy());
+            Assert.AreEqual(targetProbability, output.TargetProbability);
             Assert.AreEqual((RoundedDouble) targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual((RoundedDouble) calculatedProbability, output.CalculatedProbability, output.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(calculatedProbability, output.CalculatedProbability);
             Assert.AreEqual((RoundedDouble) calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual(convergence, output.CalculationConvergence);
         }
@@ -89,9 +89,9 @@
 
             // Assert
             Assert.AreEqual((RoundedDouble) double.NaN, output.Result);
-            Assert.AreEqual((RoundedDouble) double.NaN, output.TargetProbability);
+            Assert.AreEqual(double.NaN, output.TargetProbability);
             Assert.AreEqual((RoundedDouble) double.NaN, output.TargetReliability);
-            Assert.AreEqual((RoundedDouble) double.NaN, output.CalculatedProbability);
+            Assert.AreEqual(double.NaN, output.CalculatedProbability);
             Assert.AreEqual((RoundedDouble) double.NaN, output.CalculatedReliability);
             Assert.AreEqual(convergence, output.CalculationConvergence);
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs	(.../HydraulicBoundaryLocationOutput.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs	(.../HydraulicBoundaryLocationOutput.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -58,9 +58,9 @@
 
             Result = new RoundedDouble(2, result);
 
-            TargetProbability = new RoundedDouble(5, targetProbability);
+            TargetProbability = targetProbability;
             TargetReliability = new RoundedDouble(5, targetReliability);
-            CalculatedProbability = new RoundedDouble(5, calculatedProbability);
+            CalculatedProbability = calculatedProbability;
             CalculatedReliability = new RoundedDouble(5, calculatedReliability);
             CalculationConvergence = calculationConvergence;
         }
@@ -74,7 +74,7 @@
         /// Gets the target probability.
         /// [1/year]
         /// </summary>
-        public RoundedDouble TargetProbability { get; private set; }
+        public double TargetProbability { get; private set; }
 
         /// <summary>
         /// Gets the target beta.
@@ -86,7 +86,7 @@
         /// Gets the calculated probability.
         /// [1/year]
         /// </summary>
-        public RoundedDouble CalculatedProbability { get; private set; }
+        public double CalculatedProbability { get; private set; }
 
         /// <summary>
         /// Gets the calculated reliability.
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs	(.../HydraulicBoundaryLocationOutputTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs	(.../HydraulicBoundaryLocationOutputTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -94,9 +94,9 @@
 
             // Assert
             Assert.AreEqual(result, output.Result, output.Result.GetAccuracy());
-            Assert.AreEqual(targetProbability, output.TargetProbability, output.TargetProbability.GetAccuracy());
+            Assert.AreEqual(targetProbability, output.TargetProbability);
             Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual(calculatedProbability, output.CalculatedProbability, output.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(calculatedProbability, output.CalculatedProbability);
             Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual(convergence, output.CalculationConvergence);
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -110,9 +110,9 @@
             }
             Assert.AreEqual(expected.Result, actual.Result, expected.Result.GetAccuracy());
             Assert.AreEqual(expected.TargetReliability, actual.TargetReliability, expected.TargetReliability.GetAccuracy());
-            Assert.AreEqual(expected.TargetProbability, actual.TargetProbability, expected.TargetProbability.GetAccuracy());
+            Assert.AreEqual(expected.TargetProbability, actual.TargetProbability);
             Assert.AreEqual(expected.CalculatedReliability, actual.CalculatedReliability, expected.CalculatedReliability.GetAccuracy());
-            Assert.AreEqual(expected.CalculatedProbability, actual.CalculatedProbability, expected.CalculatedProbability.GetAccuracy());
+            Assert.AreEqual(expected.CalculatedProbability, actual.CalculatedProbability);
             Assert.AreEqual(expected.CalculationConvergence, actual.CalculationConvergence);
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs	(.../DesignWaterLevelLocationContextProperties.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs	(.../DesignWaterLevelLocationContextProperties.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -82,14 +82,15 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryLocationOutput_TargetProbability_DisplayName")]
         [ResourcesDescription(typeof(Resources), "HydraulicBoundaryLocationOutput_TargetProbability_Description")]
-        public string TargetProbability
+        [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))]
+        public double TargetProbability
         {
             get
             {
                 HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
-                return ProbabilityFormattingHelper.Format(output != null
-                                                              ? output.TargetProbability
-                                                              : double.NaN);
+                return output == null
+                           ? double.NaN
+                           : output.TargetProbability;
             }
         }
 
@@ -113,14 +114,15 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryLocationOutput_CalculatedProbability_DisplayName")]
         [ResourcesDescription(typeof(Resources), "HydraulicBoundaryLocationOutput_CalculatedProbability_Description")]
-        public string CalculatedProbability
+        [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))]
+        public double CalculatedProbability
         {
             get
             {
                 HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
-                return ProbabilityFormattingHelper.Format(output != null
-                                                              ? output.CalculatedProbability
-                                                              : double.NaN);
+                return output == null
+                           ? double.NaN
+                           : output.CalculatedProbability;
             }
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs
===================================================================
diff -u -r057b42b238eac29a114eb9163458021d87382ee2 -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs	(.../WaveHeightLocationContextProperties.cs)	(revision 057b42b238eac29a114eb9163458021d87382ee2)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs	(.../WaveHeightLocationContextProperties.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -26,7 +26,6 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Integration.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -82,14 +81,15 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryLocationOutput_TargetProbability_DisplayName")]
         [ResourcesDescription(typeof(Resources), "HydraulicBoundaryLocationOutput_TargetProbability_Description")]
-        public string TargetProbability
+        [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))]
+        public double TargetProbability
         {
             get
             {
                 HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
-                return ProbabilityFormattingHelper.Format(output != null
-                                                              ? output.TargetProbability
-                                                              : double.NaN);
+                return output == null
+                           ? double.NaN
+                           : output.TargetProbability;
             }
         }
 
@@ -105,22 +105,23 @@
                 HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
                 return output != null
                            ? output.TargetReliability
-                           : (RoundedDouble)double.NaN;
+                           : (RoundedDouble) double.NaN;
             }
         }
 
         [PropertyOrder(7)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryLocationOutput_CalculatedProbability_DisplayName")]
         [ResourcesDescription(typeof(Resources), "HydraulicBoundaryLocationOutput_CalculatedProbability_Description")]
-        public string CalculatedProbability
+        [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))]
+        public double CalculatedProbability
         {
             get
             {
                 HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
-                return ProbabilityFormattingHelper.Format(output != null
-                                                              ? output.CalculatedProbability
-                                                              : double.NaN);
+                return output == null
+                           ? double.NaN
+                           : output.CalculatedProbability;
             }
         }
 
@@ -134,7 +135,7 @@
             get
             {
                 HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
-                return output != null ? output.CalculatedReliability : (RoundedDouble)double.NaN;
+                return output != null ? output.CalculatedReliability : (RoundedDouble) double.NaN;
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -r057b42b238eac29a114eb9163458021d87382ee2 -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision 057b42b238eac29a114eb9163458021d87382ee2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -21,14 +21,15 @@
 
 using System;
 using System.ComponentModel;
-using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -77,19 +78,31 @@
             Point2D coordinates = new Point2D(x, y);
             Assert.AreEqual(coordinates, properties.Location);
             Assert.IsNaN(properties.DesignWaterLevel);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(double.NaN), properties.TargetProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextProperties,
+                              NoValueRoundedDoubleConverter>(p => p.DesignWaterLevel));
+            Assert.AreEqual(double.NaN, properties.TargetProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextProperties,
+                              FailureMechanismSectionResultNoProbabilityValueDoubleConverter>(
+                                  p => p.TargetProbability));
             Assert.IsNaN(properties.TargetReliability);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(double.NaN), properties.CalculatedProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextProperties,
+                              NoValueRoundedDoubleConverter>(p => p.TargetReliability));
+            Assert.AreEqual(double.NaN, properties.CalculatedProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextProperties,
+                              FailureMechanismSectionResultNoProbabilityValueDoubleConverter>(
+                                  p => p.CalculatedProbability));
             Assert.IsNaN(properties.CalculatedReliability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextProperties,
+                              NoValueRoundedDoubleConverter>(p => p.CalculatedReliability));
             Assert.AreEqual(string.Empty, properties.Convergence);
         }
 
         [Test]
         [TestCase(CalculationConvergence.CalculatedNotConverged, "Nee")]
         [TestCase(CalculationConvergence.CalculatedConverged, "Ja")]
         [TestCase(CalculationConvergence.NotCalculated, "")]
-        public void GetProperties_ValidDesignWaterLevel_ReturnsExpectedValues(CalculationConvergence convergence, 
-            string expectedConvergedText)
+        public void GetProperties_ValidDesignWaterLevel_ReturnsExpectedValues(CalculationConvergence convergence,
+                                                                              string expectedConvergedText)
         {
             // Setup
             var random = new Random();
@@ -122,9 +135,9 @@
 
             // Call
             var properties = new DesignWaterLevelLocationContextProperties
-                {
-                    Data = new DesignWaterLevelLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation)
-                };
+            {
+                Data = new DesignWaterLevelLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation)
+            };
 
             // Assert
             Assert.AreEqual(id, properties.Id);
@@ -133,9 +146,9 @@
             Assert.AreEqual(coordinates, properties.Location);
             Assert.AreEqual(designWaterLevel, properties.DesignWaterLevel, properties.DesignWaterLevel.GetAccuracy());
 
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(targetProbability), properties.TargetProbability);
+            Assert.AreEqual(targetProbability, properties.TargetProbability);
             Assert.AreEqual(targetReliability, properties.TargetReliability, properties.TargetReliability.GetAccuracy());
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(calculatedProbability), properties.CalculatedProbability);
+            Assert.AreEqual(calculatedProbability, properties.CalculatedProbability);
             Assert.AreEqual(calculatedReliability, properties.CalculatedReliability, properties.CalculatedReliability.GetAccuracy());
             Assert.AreEqual(expectedConvergedText, properties.Convergence);
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs
===================================================================
diff -u -r057b42b238eac29a114eb9163458021d87382ee2 -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs	(.../WaveHeightLocationContextPropertiesTest.cs)	(revision 057b42b238eac29a114eb9163458021d87382ee2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs	(.../WaveHeightLocationContextPropertiesTest.cs)	(revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
@@ -24,10 +24,11 @@
 using Core.Common.Base.Geometry;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -71,10 +72,22 @@
             Point2D coordinates = new Point2D(x, y);
             Assert.AreEqual(coordinates, properties.Location);
             Assert.IsNaN(properties.WaveHeight);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(double.NaN), properties.TargetProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<WaveHeightLocationContextProperties,
+                              NoValueRoundedDoubleConverter>(p => p.WaveHeight));
+            Assert.AreEqual(double.NaN, properties.TargetProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<WaveHeightLocationContextProperties,
+                              FailureMechanismSectionResultNoProbabilityValueDoubleConverter>(
+                                  p => p.TargetProbability));
             Assert.IsNaN(properties.TargetReliability);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(double.NaN), properties.CalculatedProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<WaveHeightLocationContextProperties,
+                              NoValueRoundedDoubleConverter>(p => p.TargetReliability));
+            Assert.AreEqual(double.NaN, properties.CalculatedProbability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<WaveHeightLocationContextProperties,
+                              FailureMechanismSectionResultNoProbabilityValueDoubleConverter>(
+                                  p => p.CalculatedProbability));
             Assert.IsNaN(properties.CalculatedReliability);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<WaveHeightLocationContextProperties,
+                              NoValueRoundedDoubleConverter>(p => p.CalculatedReliability));
             Assert.AreEqual(string.Empty, properties.Convergence);
         }
 
@@ -126,9 +139,9 @@
             Assert.AreEqual(hydraulicBoundaryLocation.Location, properties.Location);
             Assert.AreEqual(waveHeight, properties.WaveHeight, hydraulicBoundaryLocation.WaveHeight.GetAccuracy());
 
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(targetProbability), properties.TargetProbability);
+            Assert.AreEqual(targetProbability, properties.TargetProbability);
             Assert.AreEqual(targetReliability, properties.TargetReliability, properties.TargetReliability.GetAccuracy());
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(calculatedProbability), properties.CalculatedProbability);
+            Assert.AreEqual(calculatedProbability, properties.CalculatedProbability);
             Assert.AreEqual(calculatedReliability, properties.CalculatedReliability, properties.CalculatedReliability.GetAccuracy());
             Assert.AreEqual(expectedConvergedText, properties.Convergence);
         }