Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -90,7 +90,7 @@
         /// <item>Unable to open settings database file.</item>
         /// <item>Unable to read required data from database file.</item>
         /// </list></exception>
-        /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>        
+        /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
         public void Calculate(IDesignWaterLevelCalculation designWaterLevelCalculation,
                               string hydraulicBoundaryDatabaseFilePath,
                               double norm,
@@ -110,32 +110,10 @@
 
             try
             {
-                AssessmentLevelCalculationInput calculationInput = CreateInput(designWaterLevelCalculation, norm, hydraulicBoundaryDatabaseFilePath);
-
-                bool calculateIllustrationPoints = designWaterLevelCalculation.CalculateIllustrationPoints;
-                if (calculateIllustrationPoints)
-                {
-                    calculator.CalculateWithIllustrationPoints(calculationInput);
-                }
-                else
-                {
-                    calculator.Calculate(calculationInput);
-                }
-
-                if (canceled || !string.IsNullOrEmpty(calculator.LastErrorFileContent))
-                {
-                    return;
-                }
-
-                HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput(
-                    messageProvider, designWaterLevelCalculation.Name, calculationInput.Beta, norm, calculator.Converged);
-
-                if (calculateIllustrationPoints)
-                {
-                    SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult);
-                }
-
-                designWaterLevelCalculation.Output = hydraulicBoundaryLocationOutput;
+                PerformCalculation(designWaterLevelCalculation,
+                                   hydraulicBoundaryDatabaseFilePath,
+                                   norm,
+                                   messageProvider);
             }
             catch (HydraRingCalculationException e)
             {
@@ -179,6 +157,54 @@
             canceled = true;
         }
 
+        /// <summary>
+        /// Performs a calculation for the design water level.
+        /// </summary>
+        /// <param name="designWaterLevelCalculation">The design water level calculation to use.</param>
+        /// <param name="hydraulicBoundaryDatabaseFilePath">The path which points to the hydraulic boundary database file.</param>
+        /// <param name="norm">The norm of the assessment section.</param>
+        /// <param name="messageProvider">The object which is used to build log messages.</param>
+        /// <exception cref="CriticalFileReadException">Thrown when:
+        /// <list type="bullet">
+        /// <item>No settings database file could be found at the location of <paramref name="hydraulicBoundaryDatabaseFilePath"/>
+        /// with the same name.</item>
+        /// <item>Unable to open settings database file.</item>
+        /// <item>Unable to read required data from database file.</item>
+        /// </list></exception>
+        /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
+        private void PerformCalculation(IDesignWaterLevelCalculation designWaterLevelCalculation,
+                                        string hydraulicBoundaryDatabaseFilePath,
+                                        double norm,
+                                        ICalculationMessageProvider messageProvider)
+        {
+            AssessmentLevelCalculationInput calculationInput = CreateInput(designWaterLevelCalculation, norm, hydraulicBoundaryDatabaseFilePath);
+
+            bool calculateIllustrationPoints = designWaterLevelCalculation.CalculateIllustrationPoints;
+            if (calculateIllustrationPoints)
+            {
+                calculator.CalculateWithIllustrationPoints(calculationInput);
+            }
+            else
+            {
+                calculator.Calculate(calculationInput);
+            }
+
+            if (canceled || !string.IsNullOrEmpty(calculator.LastErrorFileContent))
+            {
+                return;
+            }
+
+            HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput(
+                messageProvider, designWaterLevelCalculation.Name, calculationInput.Beta, norm, calculator.Converged);
+
+            if (calculateIllustrationPoints)
+            {
+                SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult);
+            }
+
+            designWaterLevelCalculation.Output = hydraulicBoundaryLocationOutput;
+        }
+
         private static void SetIllustrationPointsResult(HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput,
                                                         HydraGeneralResult hydraGeneralResult)
         {
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -123,7 +123,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -111,32 +111,10 @@
 
             try
             {
-                WaveHeightCalculationInput calculationInput = CreateInput(waveHeightCalculation, norm, hydraulicBoundaryDatabaseFilePath);
-
-                bool calculateIllustrationPoints = waveHeightCalculation.CalculateIllustrationPoints;
-                if (calculateIllustrationPoints)
-                {
-                    calculator.CalculateWithIllustrationPoints(calculationInput);
-                }
-                else
-                {
-                    calculator.Calculate(calculationInput);
-                }
-
-                if (canceled || !string.IsNullOrEmpty(calculator.LastErrorFileContent))
-                {
-                    return;
-                }
-
-                HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput(
-                    messageProvider, waveHeightCalculation.Name, calculationInput.Beta, norm, calculator.Converged);
-
-                if (calculateIllustrationPoints)
-                {
-                    SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult);
-                }
-
-                waveHeightCalculation.Output = hydraulicBoundaryLocationOutput;
+                PerformCalculation(waveHeightCalculation,
+                                   hydraulicBoundaryDatabaseFilePath,
+                                   norm,
+                                   messageProvider);
             }
             catch (HydraRingCalculationException e)
             {
@@ -145,8 +123,8 @@
                     string lastErrorContent = calculator.LastErrorFileContent;
                     log.Error(!string.IsNullOrEmpty(lastErrorContent)
                                   ? messageProvider.GetCalculationFailedMessage(waveHeightCalculation.Name, lastErrorContent)
-                                  : messageProvider.GetCalculationFailedMessage(waveHeightCalculation.Name, e.Message), 
-                                  e);
+                                  : messageProvider.GetCalculationFailedMessage(waveHeightCalculation.Name, e.Message),
+                              e);
 
                     exceptionThrown = true;
                     throw;
@@ -180,12 +158,60 @@
             canceled = true;
         }
 
+        /// <summary>
+        /// Performs a calculation for the wave height.
+        /// </summary>
+        /// <param name="waveHeightCalculation">The wave height calculation to use.</param>
+        /// <param name="hydraulicBoundaryDatabaseFilePath">The path which points to the hydraulic boundary database file.</param>
+        /// <param name="norm">The norm of the assessment section.</param>
+        /// <param name="messageProvider">The object which is used to build log messages.</param>
+        /// <exception cref="CriticalFileReadException">Thrown when:
+        /// <list type="bullet">
+        /// <item>No settings database file could be found at the location of <paramref name="hydraulicBoundaryDatabaseFilePath"/>
+        /// with the same name.</item>
+        /// <item>Unable to open settings database file.</item>
+        /// <item>Unable to read required data from database file.</item>
+        /// </list></exception>
+        /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
+        private void PerformCalculation(IWaveHeightCalculation waveHeightCalculation,
+                                        string hydraulicBoundaryDatabaseFilePath,
+                                        double norm,
+                                        ICalculationMessageProvider messageProvider)
+        {
+            WaveHeightCalculationInput calculationInput = CreateInput(waveHeightCalculation, norm, hydraulicBoundaryDatabaseFilePath);
+
+            bool calculateIllustrationPoints = waveHeightCalculation.CalculateIllustrationPoints;
+            if (calculateIllustrationPoints)
+            {
+                calculator.CalculateWithIllustrationPoints(calculationInput);
+            }
+            else
+            {
+                calculator.Calculate(calculationInput);
+            }
+
+            if (canceled || !string.IsNullOrEmpty(calculator.LastErrorFileContent))
+            {
+                return;
+            }
+
+            HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput(
+                messageProvider, waveHeightCalculation.Name, calculationInput.Beta, norm, calculator.Converged);
+
+            if (calculateIllustrationPoints)
+            {
+                SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult);
+            }
+
+            waveHeightCalculation.Output = hydraulicBoundaryLocationOutput;
+        }
+
         private static void SetIllustrationPointsResult(HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput,
                                                         HydraGeneralResult hydraGeneralResult)
         {
             if (hydraGeneralResult != null)
             {
-                GeneralResultSubMechanismIllustrationPoint generalResult = 
+                GeneralResultSubMechanismIllustrationPoint generalResult =
                     GeneralResultSubmechanismIllustrationPointConverter.CreateGeneralResultSubmechanismIllustrationPoint(hydraGeneralResult);
                 hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
             }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointResultTest.cs
===================================================================
diff -u -r6fb7fba714affe795d1d41ae88b1fbcfcb73bbbb -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointResultTest.cs	(.../IllustrationPointResultTest.cs)	(revision 6fb7fba714affe795d1d41ae88b1fbcfcb73bbbb)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointResultTest.cs	(.../IllustrationPointResultTest.cs)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -32,12 +32,9 @@
         [Test]
         public void Constructor_DescriptionNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var random = new Random();
-            double value = random.NextDouble();
-
             // Call
-            TestDelegate call = () => new IllustrationPointResult(null, value);
+            TestDelegate call = () => new IllustrationPointResult(null,
+                                                                  new Random(21).NextDouble());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -48,16 +45,16 @@
         public void Constructor_ValidArguments_ReturnExpectedValues()
         {
             // Setup
-            const string name = "illustration point";
+            const string description = "illustration point";
 
             var random = new Random(21);
             double value = random.NextDouble();
 
             // Call
-            var illustrationPointResult = new IllustrationPointResult(name, value);
+            var illustrationPointResult = new IllustrationPointResult(description, value);
 
             // Assert
-            Assert.AreEqual(name, illustrationPointResult.Description);
+            Assert.AreEqual(description, illustrationPointResult.Description);
             Assert.AreEqual(value, illustrationPointResult.Value,
                             illustrationPointResult.Value.GetAccuracy());
             Assert.AreEqual(5, illustrationPointResult.Value.NumberOfDecimalPlaces);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/WindDirectionTest.cs
===================================================================
diff -u -r7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/WindDirectionTest.cs	(.../WindDirectionTest.cs)	(revision 7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/WindDirectionTest.cs	(.../WindDirectionTest.cs)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -34,24 +34,21 @@
         {
             // Setup
             var random = new Random(21);
-            double value = random.NextDouble();
 
             // Call
-            TestDelegate call = () => new WindDirection(null, value);
+            TestDelegate call = () => new WindDirection(null, random.NextDouble());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("name", exception.ParamName);
         }
 
         [Test]
-        [TestCase(360.004)]
-        [TestCase(double.NaN)]
-        [TestCase(50)]
-        [TestCase(-0.004)]
-        public void Constructor_ValidValues_ReturnsExpectedValues(double angle)
+        public void Constructor_ValidValues_ReturnsExpectedValues()
         {
             // Setup
+            var random = new Random(21);
+            double angle = random.NextDouble();
             const string windDirectionName = "SSE";
 
             // Call
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/FaultTreeIllustrationPointTest.cs
===================================================================
diff -u -r0748ce1d3449ef7d34ce00c68fa7319ab9d4fbfe -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/FaultTreeIllustrationPointTest.cs	(.../FaultTreeIllustrationPointTest.cs)	(revision 0748ce1d3449ef7d34ce00c68fa7319ab9d4fbfe)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/FaultTreeIllustrationPointTest.cs	(.../FaultTreeIllustrationPointTest.cs)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -34,11 +34,11 @@
         {
             // Setup
             var random = new Random(123);
-            double beta = random.NextDouble();
-            var combinationType = random.NextEnumValue<CombinationType>();
 
             // Call
-            TestDelegate call = () => new FaultTreeIllustrationPoint(null, beta, combinationType);
+            TestDelegate call = () => new FaultTreeIllustrationPoint(null,
+                                                                     random.NextDouble(),
+                                                                     random.NextEnumValue<CombinationType>());
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/GeneralResultTest.cs
===================================================================
diff -u -r66a40e718fdf95596f8897d81af4a1a0144cfae4 -ra5cd9b063d07cb1205e7691b7ff38fc393005210
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/GeneralResultTest.cs	(.../GeneralResultTest.cs)	(revision 66a40e718fdf95596f8897d81af4a1a0144cfae4)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/GeneralResultTest.cs	(.../GeneralResultTest.cs)	(revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
@@ -49,12 +49,9 @@
         [Test]
         public void Constructor_StochastsNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var governingWind = new TestWindDirection();
-
             // Call
             TestDelegate call = () => new GeneralResult(0,
-                                                        governingWind,
+                                                        new TestWindDirection(),
                                                         null,
                                                         new Dictionary<
                                                             WindDirectionClosingSituation,
@@ -68,12 +65,9 @@
         [Test]
         public void Constructor_IllustrationPointsNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var governingWind = new TestWindDirection();
-
             // Call
             TestDelegate call = () => new GeneralResult(0,
-                                                        governingWind,
+                                                        new TestWindDirection(),
                                                         Enumerable.Empty<Stochast>(),
                                                         null);