Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistributionVariationCoefficient.cs
===================================================================
diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistributionVariationCoefficient.cs	(.../IDistributionVariationCoefficient.cs)	(revision e1157c221217ef3b5ade6034183a7da0e620eb05)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistributionVariationCoefficient.cs	(.../IDistributionVariationCoefficient.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -28,7 +28,7 @@
     /// <summary>
     /// Extension for <see cref="IDistribution"/> to support variation coefficient.
     /// </summary>
-    public static class IDistributionVariationCoefficient
+    public static class IDistributionExtensions
     {
         /// <summary>
         /// Gets the variation coefficient (<see cref="IDistribution.StandardDeviation"/> / <see cref="IDistribution.Mean"/>) of the distribution.
@@ -37,8 +37,8 @@
         /// <returns>The variation coefficient.</returns>
         public static RoundedDouble GetVariationCoefficient(this IDistribution distribution)
         {
-            return new RoundedDouble(distribution.Mean.NumberOfDecimalPlaces, (distribution.Mean <= 0) ?
-                                                                                  double.NegativeInfinity :
+            return new RoundedDouble(distribution.Mean.NumberOfDecimalPlaces, (distribution.Mean == 0) ?
+                                                                                  double.PositiveInfinity :
                                                                                   distribution.StandardDeviation/distribution.Mean);
         }
 
@@ -47,6 +47,7 @@
         /// </summary>
         /// <param name="distribution">The distribution.</param>
         /// <param name="variationCoefficient">The variation coefficient.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Standard deviation is less than 0.</exception>
         public static void SetStandardDeviationFromVariationCoefficient(this IDistribution distribution, double variationCoefficient)
         {
             distribution.StandardDeviation = (RoundedDouble) variationCoefficient*distribution.Mean;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionProperties.cs
===================================================================
diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionProperties.cs	(.../DistributionProperties.cs)	(revision e1157c221217ef3b5ade6034183a7da0e620eb05)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionProperties.cs	(.../DistributionProperties.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -25,6 +25,7 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Properties;
 
@@ -35,6 +36,8 @@
     /// </summary>
     public abstract class DistributionProperties : ObjectProperties<IDistribution>
     {
+        private static string meanDisplayName;
+        private static string standardDeviationDisplayName;
         protected readonly bool IsVariationCoefficientReadOnly;
         private readonly bool isMeanReadOnly;
         private readonly bool isStandardDeviationReadOnly;
@@ -45,6 +48,9 @@
             isStandardDeviationReadOnly = propertiesReadOnly == DistributionPropertiesReadOnly.All || propertiesReadOnly == DistributionPropertiesReadOnly.StandardDeviation;
             isMeanReadOnly = propertiesReadOnly == DistributionPropertiesReadOnly.All || propertiesReadOnly == DistributionPropertiesReadOnly.Mean;
             IsVariationCoefficientReadOnly = propertiesReadOnly == DistributionPropertiesReadOnly.All || propertiesReadOnly == DistributionPropertiesReadOnly.VariationCoefficient;
+
+            meanDisplayName = TypeUtils.GetMemberName<DistributionProperties>(rd => rd.Mean);
+            standardDeviationDisplayName = TypeUtils.GetMemberName<DistributionProperties>(rd => rd.StandardDeviation);
         }
 
         [PropertyOrder(1)]
@@ -72,7 +78,7 @@
                 {
                     throw new ArgumentException("No observerable object set.");
                 }
-                data.Mean = new RoundedDouble(data.StandardDeviation.NumberOfDecimalPlaces, value);
+                data.Mean = value;
                 Observerable.NotifyObservers();
             }
         }
@@ -97,25 +103,27 @@
                 {
                     throw new ArgumentException("No observerable object set.");
                 }
-                data.StandardDeviation = new RoundedDouble(data.StandardDeviation.NumberOfDecimalPlaces, value);
+                data.StandardDeviation = value;
                 Observerable.NotifyObservers();
             }
         }
 
         [DynamicReadOnlyValidationMethod]
         public bool DynamicReadOnlyValidationMethod(string propertyName)
         {
-            switch (propertyName)
+            if (propertyName == meanDisplayName)
             {
-                case "Mean":
-                    return isMeanReadOnly;
-                case "StandardDeviation":
-                    return isStandardDeviationReadOnly;
-                case "VariationCoefficient":
-                    return IsVariationCoefficientReadOnly;
-                default:
-                    return false;
+                return isMeanReadOnly;
             }
+            if (propertyName == standardDeviationDisplayName)
+            {
+                return isStandardDeviationReadOnly;
+            }
+            if (propertyName == "VariationCoefficient")
+            {
+                return IsVariationCoefficientReadOnly;
+            }
+            return false;
         }
 
         public override string ToString()
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionPropertiesReadOnly.cs
===================================================================
diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionPropertiesReadOnly.cs	(.../DistributionPropertiesReadOnly.cs)	(revision e1157c221217ef3b5ade6034183a7da0e620eb05)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionPropertiesReadOnly.cs	(.../DistributionPropertiesReadOnly.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -37,7 +37,7 @@
         Mean,
 
         /// <summary>
-        /// Mark<see cref="DistributionProperties.StandardDeviation"/> read-only.
+        /// Mark <see cref="DistributionProperties.StandardDeviation"/> read-only.
         /// </summary>
         StandardDeviation,
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -497,7 +497,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Oriëntatie [º].
+        ///   Looks up a localized string similar to Oriëntatie [°].
         /// </summary>
         public static string Orientation_DisplayName {
             get {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -224,7 +224,7 @@
     <value>Oriëntatie van de dijk.</value>
   </data>
   <data name="Orientation_DisplayName" xml:space="preserve">
-    <value>Oriëntatie [º]</value>
+    <value>Oriëntatie [°]</value>
   </data>
   <data name="GrassCoverErosionInwardsInput_FbFactor_Description" xml:space="preserve">
     <value>De parameter 'Fb' die gebruikt wordt in de berekening.</value>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r0e8590d1ba6edc87a2ac73240662bfcf45f20914 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 0e8590d1ba6edc87a2ac73240662bfcf45f20914)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -189,7 +189,7 @@
             Assert.IsNotNull(orientationProperty);
             Assert.IsFalse(orientationProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", orientationProperty.Category);
-            Assert.AreEqual("Oriëntatie [º]", orientationProperty.DisplayName);
+            Assert.AreEqual("Oriëntatie [°]", orientationProperty.DisplayName);
             Assert.AreEqual("Oriëntatie van de dijk.", orientationProperty.Description);
 
             PropertyDescriptor breakWaterProperty = dynamicProperties[breakWaterPropertyIndex];
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -366,7 +366,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Oriëntatie [º].
+        ///   Looks up a localized string similar to Oriëntatie [°].
         /// </summary>
         public static string OrientationOfTheNormalOfTheStructure_DisplayName {
             get {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -218,7 +218,7 @@
     <value>Oriëntatie van het kunstwerk.</value>
   </data>
   <data name="OrientationOfTheNormalOfTheStructure_DisplayName" xml:space="preserve">
-    <value>Oriëntatie [º]</value>
+    <value>Oriëntatie [°]</value>
   </data>
   <data name="StorageStructureArea_Description" xml:space="preserve">
     <value>Het kombergend oppervlak dat gebruikt wordt tijdens de berekening.</value>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -r63e64c82e06f820a466370a462394dc5396219e3 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 63e64c82e06f820a466370a462394dc5396219e3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -66,7 +66,7 @@
             RoundedDouble defaultModelFactorOvertoppingSupercriticalFlowStandardDeviation = input.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation;
             NormalDistribution modelFactorOvertoppingSuperCriticalFlow = new NormalDistribution(5)
             {
-                Mean = (RoundedDouble) random.NextDouble(),
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
                 StandardDeviation = (RoundedDouble) random.NextDouble()
             };
 
@@ -118,7 +118,7 @@
             RoundedDouble defaultStormDurationStandardDeviation = input.StormDuration.StandardDeviation;
             LogNormalDistribution stormDuration = new LogNormalDistribution(5)
             {
-                Mean = (RoundedDouble) random.NextDouble(),
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
                 StandardDeviation = (RoundedDouble) random.NextDouble()
             };
 
@@ -176,7 +176,7 @@
 
             LogNormalDistribution allowableIncreaseOfLevelForStorage = new LogNormalDistribution(5)
             {
-                Mean = (RoundedDouble) random.NextDouble(),
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
                 StandardDeviation = (RoundedDouble) random.NextDouble()
             };
 
@@ -197,7 +197,7 @@
 
             LogNormalDistribution storageStructureArea = new LogNormalDistribution(5)
             {
-                Mean = (RoundedDouble) random.NextDouble(),
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
                 StandardDeviation = (RoundedDouble) random.NextDouble()
             };
 
@@ -218,7 +218,7 @@
 
             LogNormalDistribution flowWidthAtBottomProtection = new LogNormalDistribution(5)
             {
-                Mean = (RoundedDouble) random.NextDouble(),
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
                 StandardDeviation = (RoundedDouble) random.NextDouble()
             };
 
@@ -239,7 +239,7 @@
 
             LogNormalDistribution criticalOvertoppingDischarge = new LogNormalDistribution(5)
             {
-                Mean = (RoundedDouble) random.NextDouble(),
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
                 StandardDeviation = (RoundedDouble) random.NextDouble()
             };
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresContextTest.cs
===================================================================
diff -u -r37a53b1ca9a4cdfc6e6df7f065cd540c627f2622 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresContextTest.cs	(.../HeightStructuresContextTest.cs)	(revision 37a53b1ca9a4cdfc6e6df7f065cd540c627f2622)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresContextTest.cs	(.../HeightStructuresContextTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -105,8 +105,8 @@
             // Setup
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Twice();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -199,70 +199,59 @@
             Assert.AreEqual(12, dynamicProperties.Count);
 
             PropertyDescriptor orientationOfTheNormalOfTheStructureProperty = dynamicProperties[orientationOfTheNormalOfTheStructurePropertyIndex];
-            Assert.IsNotNull(orientationOfTheNormalOfTheStructureProperty);
             Assert.IsFalse(orientationOfTheNormalOfTheStructureProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", orientationOfTheNormalOfTheStructureProperty.Category);
-            Assert.AreEqual("Oriëntatie [º]", orientationOfTheNormalOfTheStructureProperty.DisplayName);
+            Assert.AreEqual("Oriëntatie [°]", orientationOfTheNormalOfTheStructureProperty.DisplayName);
             Assert.AreEqual("Oriëntatie van het kunstwerk.", orientationOfTheNormalOfTheStructureProperty.Description);
 
             PropertyDescriptor levelOfCrestOfStructureProperty = dynamicProperties[levelOfCrestOfStructurePropertyIndex];
-            Assert.IsNotNull(levelOfCrestOfStructureProperty);
             Assert.AreEqual("Schematisatie", levelOfCrestOfStructureProperty.Category);
             Assert.AreEqual("Kerende hoogte [m]", levelOfCrestOfStructureProperty.DisplayName);
             Assert.AreEqual("Kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening.", levelOfCrestOfStructureProperty.Description);
 
             PropertyDescriptor allowableIncreaseOfLevelForStorageProperty = dynamicProperties[allowableIncreaseOfLevelForStoragePropertyIndex];
-            Assert.IsNotNull(allowableIncreaseOfLevelForStorageProperty);
             Assert.AreEqual("Schematisatie", allowableIncreaseOfLevelForStorageProperty.Category);
             Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowableIncreaseOfLevelForStorageProperty.DisplayName);
             Assert.AreEqual("De toegestane peilverhoging komberging dat gebruikt wordt tijdens de berekening.", allowableIncreaseOfLevelForStorageProperty.Description);
 
             PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex];
-            Assert.IsNotNull(storageStructureAreaProperty);
             Assert.AreEqual("Schematisatie", storageStructureAreaProperty.Category);
             Assert.AreEqual("Kombergend oppervlak [m²]", storageStructureAreaProperty.DisplayName);
             Assert.AreEqual("Het kombergend oppervlak dat gebruikt wordt tijdens de berekening.", storageStructureAreaProperty.Description);
 
             PropertyDescriptor flowWidthAtBottomProtectionProperty = dynamicProperties[flowWidthAtBottomProtectionPropertyIndex];
-            Assert.IsNotNull(flowWidthAtBottomProtectionProperty);
             Assert.AreEqual("Schematisatie", flowWidthAtBottomProtectionProperty.Category);
             Assert.AreEqual("Stroomvoerende breedte bij bodembescherming [m]", flowWidthAtBottomProtectionProperty.DisplayName);
             Assert.AreEqual("De stroomvoerende breedte bij bodembescherming die gebruikt wordt tijdens de berekening.", flowWidthAtBottomProtectionProperty.Description);
 
             PropertyDescriptor widthOfFlowAperturesProperty = dynamicProperties[widthOfFlowAperturesPropertyIndex];
-            Assert.IsNotNull(widthOfFlowAperturesProperty);
             Assert.AreEqual("Schematisatie", widthOfFlowAperturesProperty.Category);
             Assert.AreEqual("Breedte van de kruin van het kunstwerk [m]", widthOfFlowAperturesProperty.DisplayName);
             Assert.AreEqual("De breedte van de kruin van het kunstwerk die gebruikt wordt tijdens de berekening.", widthOfFlowAperturesProperty.Description);
 
             PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex];
-            Assert.IsNotNull(criticalOvertoppingDischargeProperty);
             Assert.AreEqual("Schematisatie", criticalOvertoppingDischargeProperty.Category);
             Assert.AreEqual("Kritiek overslagdebiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName);
             Assert.AreEqual("Het kritieke overslagdebiet per strekkende meter.", criticalOvertoppingDischargeProperty.Description);
 
             PropertyDescriptor failureProbabilityOfStructureGivenErosionProperty = dynamicProperties[failureProbabilityOfStructureGivenErosionPropertyIndex];
-            Assert.IsNotNull(failureProbabilityOfStructureGivenErosionProperty);
             Assert.IsFalse(failureProbabilityOfStructureGivenErosionProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", failureProbabilityOfStructureGivenErosionProperty.Category);
             Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityOfStructureGivenErosionProperty.DisplayName);
             Assert.AreEqual("De faalkans kunstwerk gegeven erosie bodem.", failureProbabilityOfStructureGivenErosionProperty.Description);
 
             PropertyDescriptor modelFactorOvertoppingSuperCriticalFlowProperty = dynamicProperties[modelFactorOvertoppingSuperCriticalFlowPropertyIndex];
-            Assert.IsNotNull(modelFactorOvertoppingSuperCriticalFlowProperty);
             Assert.AreEqual("Modelfactoren", modelFactorOvertoppingSuperCriticalFlowProperty.Category);
             Assert.AreEqual("Modelfactor overloopdebiet volkomen overlaat [-]", modelFactorOvertoppingSuperCriticalFlowProperty.DisplayName);
             Assert.AreEqual("Het modelfactor overloopdebiet volkomen overlaat dat gebruikt wordt tijdens de berekening.", modelFactorOvertoppingSuperCriticalFlowProperty.Description);
 
             PropertyDescriptor hydraulicBoundaryLocationProperty = dynamicProperties[hydraulicBoundaryLocationPropertyIndex];
-            Assert.IsNotNull(modelFactorOvertoppingSuperCriticalFlowProperty);
             Assert.IsFalse(hydraulicBoundaryLocationProperty.IsReadOnly);
             Assert.AreEqual("Hydraulische gegevens", hydraulicBoundaryLocationProperty.Category);
             Assert.AreEqual("Locatie met hydraulische randvoorwaarden", hydraulicBoundaryLocationProperty.DisplayName);
             Assert.AreEqual("De locatie met hydraulische randvoorwaarden die gebruikt wordt tijdens de berekening.", hydraulicBoundaryLocationProperty.Description);
 
             PropertyDescriptor stormDurationProperty = dynamicProperties[stormDurationPropertyIndex];
-            Assert.IsNotNull(stormDurationProperty);
             Assert.AreEqual("Hydraulische gegevens", stormDurationProperty.Category);
             Assert.AreEqual("Stormduur [uren]", stormDurationProperty.DisplayName);
             Assert.AreEqual("De duur van de storm dat gebruikt wordt tijdens de berekening.", stormDurationProperty.Description);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj
===================================================================
diff -u -rcfbc63bdf527a3b6b51c6bfb5442eecd8c7a9c37 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision cfbc63bdf527a3b6b51c6bfb5442eecd8c7a9c37)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -141,7 +141,6 @@
       <Name>Ringtoets.HeightStructures.Plugin</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs
===================================================================
diff -u -r7f4ee0fa245a18426c81c11c8f9ea18e73e42d07 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs	(.../HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision 7f4ee0fa245a18426c81c11c8f9ea18e73e42d07)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs	(.../HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -56,15 +56,15 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var heightStructuresInput = new HeightStructuresInput();
             var calculationMock = mockRepository.StrictMock<ICalculation>();
-            
+
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
                                  .Return(hydraulicBoundaryDatabase)
                                  .Repeat.AtLeastOnce();
             var inputContext = new HeightStructuresInputContext(heightStructuresInput,
-                                                                        calculationMock,
-                                                                        failureMechanism,
-                                                                        assessmentSectionMock);
+                                                                calculationMock,
+                                                                failureMechanism,
+                                                                assessmentSectionMock);
 
             var properties = new HeightStructuresInputContextProperties
             {
@@ -75,10 +75,10 @@
 
             var serviceProviderMock = mockRepository.StrictMock<IServiceProvider>();
             var serviceMock = mockRepository.StrictMock<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.StrictMock<ITypeDescriptorContext>();
+            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
             serviceProviderMock.Expect(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
             serviceMock.Expect(s => s.DropDownControl(null)).IgnoreArguments();
-            descriptorContextMock.Expect(c => c.Instance).Return(propertyBag).Repeat.Twice();
+            descriptorContextMock.Expect(c => c.Instance).Return(propertyBag).Repeat.Any();
             mockRepository.ReplayAll();
 
             var someValue = new object();
@@ -112,9 +112,9 @@
                                  .Return(hydraulicBoundaryDatabase)
                                  .Repeat.AtLeastOnce();
             var inputContext = new HeightStructuresInputContext(heightStructuresInput,
-                                                                        calculationMock,
-                                                                        failureMechanism,
-                                                                        assessmentSectionMock);
+                                                                calculationMock,
+                                                                failureMechanism,
+                                                                assessmentSectionMock);
 
             var properties = new HeightStructuresInputContextProperties
             {
@@ -145,7 +145,7 @@
 
         private class TestHydraulicBoundaryLocation : HydraulicBoundaryLocation
         {
-            public TestHydraulicBoundaryLocation() : base(0, string.Empty, 0, 0) { }
+            public TestHydraulicBoundaryLocation() : base(0, string.Empty, 0, 0) {}
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/GeneralPipingInput.cs
===================================================================
diff -u -r8ca454de1833ad8a8d63bcaefdfb5d886a187a01 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/GeneralPipingInput.cs	(.../GeneralPipingInput.cs)	(revision 8ca454de1833ad8a8d63bcaefdfb5d886a187a01)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/GeneralPipingInput.cs	(.../GeneralPipingInput.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -44,7 +44,7 @@
             MeanDiameter70 = 2.08e-4;
             SellmeijerReductionFactor = 0.3;
         }
-        
+
         #region General parameters (used by multiple calculations)
 
         /// <summary>
@@ -100,7 +100,7 @@
         public double BeddingAngle { get; private set; }
 
         /// <summary>
-        /// Gets the kinematic viscosity of water at 10 degrees Celsius.
+        /// Gets the kinematic viscosity of water at 10 °C.
         /// [m²/s]
         /// </summary>
         public double WaterKinematicViscosity { get; private set; }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs	(.../PipingInput.cs)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs	(.../PipingInput.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -268,7 +268,7 @@
         }
 
         /// <summary>
-        /// Gets the kinematic viscosity of water at 10 degrees Celsius.
+        /// Gets the kinematic viscosity of water at 10 °C.
         /// [m²/s]
         /// </summary>
         public double WaterKinematicViscosity
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r244c9b98363c8e517c0b7d9520e83a181fa8a373 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 244c9b98363c8e517c0b7d9520e83a181fa8a373)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -223,7 +223,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Rolweerstandshoek [º].
+        ///   Looks up a localized string similar to Rolweerstandshoek [°].
         /// </summary>
         public static string GeneralPipingInput_BeddingAngle_DisplayName {
             get {
@@ -358,7 +358,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kinematische viscositeit van water bij 10º Celsius..
+        ///   Looks up a localized string similar to Kinematische viscositeit van water bij 10° C..
         /// </summary>
         public static string GeneralPipingInput_WaterKinematicViscosity_Description {
             get {
@@ -367,7 +367,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kinematische viscositeit van water bij 10º Celsius [m²/s].
+        ///   Looks up a localized string similar to Kinematische viscositeit van water bij 10° C [m²/s].
         /// </summary>
         public static string GeneralPipingInput_WaterKinematicViscosity_DisplayName {
             get {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r244c9b98363c8e517c0b7d9520e83a181fa8a373 -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 244c9b98363c8e517c0b7d9520e83a181fa8a373)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -127,7 +127,7 @@
     <value>Hoek in het krachtenevenwicht die aangeeft hoeveel weerstand de korrels bieden tegen rollen; ook beddingshoek genoemd.</value>
   </data>
   <data name="GeneralPipingInput_BeddingAngle_DisplayName" xml:space="preserve">
-    <value>Rolweerstandshoek [º]</value>
+    <value>Rolweerstandshoek [°]</value>
   </data>
   <data name="GeneralPipingInput_CriticalHeaveGradient_Description" xml:space="preserve">
     <value>Kritiek verhang met betrekking tot heave.</value>
@@ -223,10 +223,10 @@
     <value>Modelfactor opbarsten [-]</value>
   </data>
   <data name="GeneralPipingInput_WaterKinematicViscosity_Description" xml:space="preserve">
-    <value>Kinematische viscositeit van water bij 10º Celsius.</value>
+    <value>Kinematische viscositeit van water bij 10° C.</value>
   </data>
   <data name="GeneralPipingInput_WaterKinematicViscosity_DisplayName" xml:space="preserve">
-    <value>Kinematische viscositeit van water bij 10º Celsius [m²/s]</value>
+    <value>Kinematische viscositeit van water bij 10° C [m²/s]</value>
   </data>
   <data name="GeneralPipingInput_WaterVolumetricWeight_Description" xml:space="preserve">
     <value>Volumiek gewicht van water.</value>
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs	(.../PipingCalculatorInput.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs	(.../PipingCalculatorInput.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
@@ -73,7 +73,7 @@
         /// <param name="whitesDragCoefficient">The White's drag coefficient.</param>
         /// <param name="diameter70">The sieve size through which 70% fraction of the grains of the top part of the aquifer passes. [m]</param>
         /// <param name="darcyPermeability">The Darcy-speed with which water flows through the aquifer layer. [m/s]</param>
-        /// <param name="waterKinematicViscosity">The kinematic viscosity of water at 10 degrees Celsius. [m²/s]</param>
+        /// <param name="waterKinematicViscosity">The kinematic viscosity of water at 10 °C. [m²/s]</param>
         /// <param name="gravity">The gravitational acceleration. [m/s²]</param>
         /// <param name="thicknessAquiferLayer">The thickness of the aquifer layer. [m]</param>
         /// <param name="meanDiameter70">The mean diameter of small scale tests applied to different kinds of sand, on which the formula of Sellmeijer has been fit. [m]</param>
@@ -286,7 +286,7 @@
         }
 
         /// <summary>
-        /// Gets the kinematic viscosity of water at 10 degrees Celsius.
+        /// Gets the kinematic viscosity of water at 10 °C.
         /// [m²/s]
         /// </summary>
         public double WaterKinematicViscosity