Index: Core/Common/test/Core.Common.Utils.Test/StatisticsConverterTest.cs
===================================================================
diff -u -r7ec5d40014c7ff2faaba8fe3bef778a9d728cc37 -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde
--- Core/Common/test/Core.Common.Utils.Test/StatisticsConverterTest.cs	(.../StatisticsConverterTest.cs)	(revision 7ec5d40014c7ff2faaba8fe3bef778a9d728cc37)
+++ Core/Common/test/Core.Common.Utils.Test/StatisticsConverterTest.cs	(.../StatisticsConverterTest.cs)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
@@ -29,7 +29,11 @@
         [Test]
         public void NormToBeta_ConvertNorm_CorrectBeta()
         {
-            Assert.AreEqual(-1.335177736, StatisticsConverter.NormToBeta(1.1), 1.0e-8);
+            // Call
+            double normToBeta = StatisticsConverter.NormToBeta(1.1);
+
+            // Assert
+            Assert.AreEqual(-1.335177736, normToBeta, 1.0e-6);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs
===================================================================
diff -u -r7ec5d40014c7ff2faaba8fe3bef778a9d728cc37 -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 7ec5d40014c7ff2faaba8fe3bef778a9d728cc37)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
@@ -88,7 +88,7 @@
         public bool DesignWaterLevelCalculationConvergence { get; set; }
 
         /// <summary>
-        /// Gets sets the convergence status of the waveheight calculation.
+        /// Gets or sets the convergence status of the waveheight calculation.
         /// </summary>
         public bool WaveHeightCalculationConvergence { get; set; }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r59c72034952ec0b85bead7948a1a15e8058e5dac -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 59c72034952ec0b85bead7948a1a15e8058e5dac)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -405,9 +405,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Convergentie.
         /// </summary>
-        public static string HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_DisplayName {
+        public static string HydraulicBoundaryDatabase_Convergence_DisplayName {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_DisplayName", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabase_Convergence_DisplayName", resourceCulture);
             }
         }
         
@@ -421,15 +421,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Convergentie.
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Convergence_WaveHeight_DisplayName {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Convergence_WaveHeight_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Hydraulische randvoorwaarden.
         /// </summary>
         public static string HydraulicBoundaryDatabase_DisplayName {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r59c72034952ec0b85bead7948a1a15e8058e5dac -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 59c72034952ec0b85bead7948a1a15e8058e5dac)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
@@ -329,15 +329,12 @@
   <data name="HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description" xml:space="preserve">
     <value>Convergentie status van de toetspeil berekening.</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_DisplayName" xml:space="preserve">
+  <data name="HydraulicBoundaryDatabase_Convergence_DisplayName" xml:space="preserve">
     <value>Convergentie</value>
   </data>
   <data name="HydraulicBoundaryDatabase_Convergence_WaveHeight_Description" xml:space="preserve">
     <value>Convergentie status van de golfhoogte berekening.</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Convergence_WaveHeight_DisplayName" xml:space="preserve">
-    <value>Convergentie</value>
-  </data>
   <data name="HydraulicBoundaryLocationDesignWaterLevelRow_Calculate" xml:space="preserve">
     <value>Berekenen</value>
   </data>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelProperties.cs
===================================================================
diff -u -r296d58d9725ec3472edc90a9448f07aceba37d86 -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelProperties.cs	(.../HydraulicBoundaryLocationDesignWaterLevelProperties.cs)	(revision 296d58d9725ec3472edc90a9448f07aceba37d86)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelProperties.cs	(.../HydraulicBoundaryLocationDesignWaterLevelProperties.cs)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
@@ -80,7 +80,7 @@
         /// </summary>
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Common.Data.Properties.Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_DisplayName")]
+        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_DisplayName")]
         [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description")]
         public bool Convergence {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationWaveHeightProperties.cs
===================================================================
diff -u -r296d58d9725ec3472edc90a9448f07aceba37d86 -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationWaveHeightProperties.cs	(.../HydraulicBoundaryLocationWaveHeightProperties.cs)	(revision 296d58d9725ec3472edc90a9448f07aceba37d86)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationWaveHeightProperties.cs	(.../HydraulicBoundaryLocationWaveHeightProperties.cs)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
@@ -80,7 +80,7 @@
         /// </summary>
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Common.Data.Properties.Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_WaveHeight_DisplayName")]
+        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_DisplayName")]
         [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_WaveHeight_Description")]
         public bool Convergence
         {