Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -r4550874ecf6de10bb429ddf8edb1b7542a980252 -r3d6119b921ede5e5eea3de083a17a26f12ffa447
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs)	(revision 4550874ecf6de10bb429ddf8edb1b7542a980252)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs)	(revision 3d6119b921ede5e5eea3de083a17a26f12ffa447)
@@ -102,7 +102,7 @@
         [TestCase(CalculationConvergence.CalculatedConverged, "Ja")]
         [TestCase(CalculationConvergence.CalculatedNotConverged, "Nee")]
         [TestCase(CalculationConvergence.NotCalculated, "")]
-        public void GetProperties_ValidData_ReturnsExpectedValues(CalculationConvergence convergenceReached, string expectedConvergenceValue)
+        public void GetProperties_ValidData_ReturnsExpectedValues(CalculationConvergence convergence, string expectedConvergenceValue)
         {
             // Setup
             var random = new Random();
@@ -123,7 +123,7 @@
                                                                              targetReliability,
                                                                              calculatedProbability,
                                                                              calculatedReliability,
-                                                                             convergenceReached)
+                                                                             convergence)
             };
             var locations = new ObservableList<HydraulicBoundaryLocation>
             {
@@ -179,71 +179,62 @@
             Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
 
             PropertyDescriptor idProperty = dynamicProperties[idPropertyIndex];
-            Assert.IsNotNull(idProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty,
                                                                             "Algemeen",
                                                                             "ID",
                                                                             "ID van de hydraulische randvoorwaardenlocatie in de database.",
                                                                             true);
 
             PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
-            Assert.IsNotNull(nameProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
                                                                             "Algemeen",
                                                                             "Naam",
                                                                             "Naam van de hydraulische randvoorwaardenlocatie.",
                                                                             true);
 
             PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
-            Assert.IsNotNull(coordinatesProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(coordinatesProperty,
                                                                             "Algemeen",
                                                                             "Coördinaten [m]",
                                                                             "Coördinaten van de hydraulische randvoorwaardenlocatie.",
                                                                             true);
 
             PropertyDescriptor designWaterLevelProperty = dynamicProperties[designWaterLevelPropertyIndex];
-            Assert.IsNotNull(designWaterLevelProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(designWaterLevelProperty,
                                                                             "Resultaat",
                                                                             "Waterstand bij doorsnede-eis [m+NAP]",
                                                                             "Berekende waterstand bij doorsnede-eis.",
                                                                             true);
 
             PropertyDescriptor targetProbabilityProperty = dynamicProperties[targetProbabilityPropertyIndex];
-            Assert.IsNotNull(targetProbabilityProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetProbabilityProperty,
                                                                             "Resultaat",
                                                                             "Doelkans [1/jaar]",
                                                                             "De ingevoerde kans waarvoor het resultaat moet worden berekend.",
                                                                             true);
 
             PropertyDescriptor targetReliabilityProperty = dynamicProperties[targetReliabilityPropertyIndex];
-            Assert.IsNotNull(targetReliabilityProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetReliabilityProperty,
                                                                             "Resultaat",
                                                                             "Betrouwbaarheidsindex doelkans [-]",
                                                                             "Betrouwbaarheidsindex van de ingevoerde kans waarvoor het resultaat moet worden berekend.",
                                                                             true);
 
             PropertyDescriptor calculatedProbabilityProperty = dynamicProperties[calculatedProbabilityPropertyIndex];
-            Assert.IsNotNull(calculatedProbabilityProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculatedProbabilityProperty,
                                                                             "Resultaat",
                                                                             "Berekende kans [1/jaar]",
                                                                             "De berekende kans van voorkomen van het berekende resultaat.",
                                                                             true);
 
             PropertyDescriptor calculatedReliabilityProperty = dynamicProperties[calculatedReliabilityPropertyIndex];
-            Assert.IsNotNull(calculatedReliabilityProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculatedReliabilityProperty,
                                                                             "Resultaat",
                                                                             "Betrouwbaarheidsindex berekende kans [-]",
                                                                             "Betrouwbaarheidsindex van de berekende kans van voorkomen van het berekende resultaat.",
                                                                             true);
 
             PropertyDescriptor convergenceProperty = dynamicProperties[convergencePropertyIndex];
-            Assert.IsNotNull(convergenceProperty);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty,
                                                                             "Resultaat",
                                                                             "Convergentie",