Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs
===================================================================
diff -u -r2c08730c6c2269937fa4f117aed1557876c567ea -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs	(.../GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs)	(revision 2c08730c6c2269937fa4f117aed1557876c567ea)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs	(.../GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -130,10 +130,10 @@
             var governingWindDirection = new WindDirection(windDirectionName, windDirectionAngle);
 
             const string illustrationPointName = "illustrationPoint";
-            var illustrationPointOne = new TopLevelSubMechanismIllustrationPoint(new TestWindDirection(),
+            var illustrationPointOne = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
                                                                                  illustrationPointName,
                                                                                  new TestSubMechanismIllustrationPoint());
-            var illustrationPointTwo = new TopLevelSubMechanismIllustrationPoint(new TestWindDirection(),
+            var illustrationPointTwo = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
                                                                                  $"{illustrationPointName}_Two",
                                                                                  new TestSubMechanismIllustrationPoint());
             var illustrationPoints = new[]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs
===================================================================
diff -u -r2c08730c6c2269937fa4f117aed1557876c567ea -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs	(.../GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs)	(revision 2c08730c6c2269937fa4f117aed1557876c567ea)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs	(.../GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -128,7 +128,7 @@
         {
             // Setup
             const string stochastName = "Stochast Name";
-            WindDirection windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             SubMechanismIllustrationPoint illustrationPoint = new TestSubMechanismIllustrationPoint();
             var illustrationPointEntityOne = new TopLevelSubMechanismIllustrationPointEntity
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubMechanismIllustrationPoint.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubMechanismIllustrationPoint.cs	(.../SubMechanismIllustrationPoint.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubMechanismIllustrationPoint.cs	(.../SubMechanismIllustrationPoint.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -33,7 +33,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SubMechanismIllustrationPoint"/>.
         /// </summary>
-        /// <param name="name">The name of the illustration point result</param>
+        /// <param name="name">The name of the illustration point result.</param>
         /// <param name="stochasts">The stochasts for the sub mechanism illustration point.</param>
         /// <param name="illustrationPointResults">The output variables.</param>
         /// <param name="beta">The beta value that was realized.</param>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/WindDirection.cs
===================================================================
diff -u -r342ecb50ef0e54c04002a2643689c6d0108518c7 -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/WindDirection.cs	(.../WindDirection.cs)	(revision 342ecb50ef0e54c04002a2643689c6d0108518c7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/WindDirection.cs	(.../WindDirection.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -27,7 +27,7 @@
     /// <summary>
     /// A wind direction.
     /// </summary>
-    public class WindDirection
+    public sealed class WindDirection
     {
         /// <summary>
         /// Creates a new instance of <see cref="WindDirection"/>.
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/GeneralResultSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/GeneralResultSubMechanismIllustrationPointTest.cs	(.../GeneralResultSubMechanismIllustrationPointTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/GeneralResultSubMechanismIllustrationPointTest.cs	(.../GeneralResultSubMechanismIllustrationPointTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -48,7 +48,7 @@
         public void Constructor_StochastsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
 
             // Call
             TestDelegate call = () => new GeneralResultSubMechanismIllustrationPoint(windDirection,
@@ -64,7 +64,7 @@
         public void Constructor_TopLevelSubMechanismIllustrationPointsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
 
             // Call
             TestDelegate call = () => new GeneralResultSubMechanismIllustrationPoint(windDirection,
@@ -80,7 +80,7 @@
         public void Constructor_ValidArguments_ExpectedProperties()
         {
             // Setup
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             IEnumerable<Stochast> stochasts = Enumerable.Empty<Stochast>();
             IEnumerable<TopLevelSubMechanismIllustrationPoint> combinations =
                 Enumerable.Empty<TopLevelSubMechanismIllustrationPoint>();
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -rc2c7e9621863d470ddd3a1d5c0e4913844066aae -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs	(.../TopLevelSubMechanismIllustrationPointTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs	(.../TopLevelSubMechanismIllustrationPointTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -48,7 +48,7 @@
         public void Constructor_ClosingSituationNull_ThrowsArgumentNullException()
         {
             // Setup
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             var submechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
 
             // Call
@@ -64,7 +64,7 @@
         public void Constructor_SubMechanismIllustationPointNull_ThrowsArgumentNullException()
         {
             // Setup
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
 
             // Call
             TestDelegate call = () =>
@@ -80,7 +80,7 @@
         {
             // Setup
             const string closingScenario = "closing scenario";
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             var submechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
 
             // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -r2c08730c6c2269937fa4f117aed1557876c567ea -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPointTest.cs	(.../TestGeneralResultSubMechanismIllustrationPointTest.cs)	(revision 2c08730c6c2269937fa4f117aed1557876c567ea)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPointTest.cs	(.../TestGeneralResultSubMechanismIllustrationPointTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -36,7 +36,7 @@
 
             // Assert
             Assert.IsInstanceOf<GeneralResultSubMechanismIllustrationPoint>(generalResult);
-            AssertWindDirection(new TestWindDirection(), generalResult.GoverningWindDirection);
+            AssertWindDirection(WindDirectionTestFactory.CreateTestWindDirection(), generalResult.GoverningWindDirection);
             CollectionAssert.IsEmpty(generalResult.Stochasts);
             CollectionAssert.IsEmpty(generalResult.TopLevelSubMechanismIllustrationPoints);
         }
Fisheye: Tag ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestWindDirectionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/WindDirectionTestFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/WindDirectionTestFactoryTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/WindDirectionTestFactoryTest.cs	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
+using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+
+namespace Ringtoets.Common.Data.TestUtil.Test.IllustrationPoints
+{
+    [TestFixture]
+    public class WindDirectionTestFactoryTest
+    {
+        [Test]
+        public void CreateTestWindDirection_ReturnsExpectedProperties()
+        {
+            // Call
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
+
+            // Assert
+            Assert.IsInstanceOf<WindDirection>(windDirection);
+
+            Assert.AreEqual("SSE", windDirection.Name);
+            Assert.AreEqual(5.0, windDirection.Angle, windDirection.Angle.GetAccuracy());
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj
===================================================================
diff -u -r2c08730c6c2269937fa4f117aed1557876c567ea -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj	(.../Ringtoets.Common.Data.TestUtil.Test.csproj)	(revision 2c08730c6c2269937fa4f117aed1557876c567ea)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj	(.../Ringtoets.Common.Data.TestUtil.Test.csproj)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -57,7 +57,7 @@
     <Compile Include="ForeshoreProfilePermutationHelperTest.cs" />
     <Compile Include="IllustrationPoints\TestGeneralResultSubMechanismIllustrationPointTest.cs" />
     <Compile Include="IllustrationPoints\TestSubMechanismIllustrationPointStochastTest.cs" />
-    <Compile Include="IllustrationPoints\TestWindDirectionTest.cs" />
+    <Compile Include="IllustrationPoints\WindDirectionTestFactoryTest.cs" />
     <Compile Include="LimitedPrecisionHelperTest.cs" />
     <Compile Include="ObservableTestAssessmentSectionStubTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs	(.../TestGeneralResultSubMechanismIllustrationPoint.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs	(.../TestGeneralResultSubMechanismIllustrationPoint.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -33,8 +33,8 @@
         /// Creates a new instance of <see cref="TestGeneralResultSubMechanismIllustrationPoint"/>.
         /// </summary>
         public TestGeneralResultSubMechanismIllustrationPoint()
-            : base(new TestWindDirection(), 
-                  Enumerable.Empty<Stochast>(), 
-                  Enumerable.Empty<TopLevelSubMechanismIllustrationPoint>()) {}
+            : base(WindDirectionTestFactory.CreateTestWindDirection(),
+                   Enumerable.Empty<Stochast>(),
+                   Enumerable.Empty<TopLevelSubMechanismIllustrationPoint>()) {}
     }
 }
\ No newline at end of file
Fisheye: Tag ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestWindDirection.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/WindDirectionTestFactory.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/WindDirectionTestFactory.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/WindDirectionTestFactory.cs	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -0,0 +1,39 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
+
+namespace Ringtoets.Common.Data.TestUtil.IllustrationPoints
+{
+    /// <summary>
+    /// Factory to create simple wind direction that can be used for testing.
+    /// </summary>
+    public static class WindDirectionTestFactory
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="WindDirection"/> used for testing.
+        /// </summary>
+        public static WindDirection CreateTestWindDirection()
+        {
+            return new WindDirection("SSE", 5.0);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj	(.../Ringtoets.Common.Data.TestUtil.csproj)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj	(.../Ringtoets.Common.Data.TestUtil.csproj)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -76,7 +76,7 @@
     <Compile Include="TestHydraulicBoundaryLocationOutput.cs" />
     <Compile Include="TestStructure.cs" />
     <Compile Include="TestStructuresOutput.cs" />
-    <Compile Include="IllustrationPoints\TestWindDirection.cs" />
+    <Compile Include="IllustrationPoints\WindDirectionTestFactory.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs	(.../RingtoetsStackChartDataFactoryTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs	(.../RingtoetsStackChartDataFactoryTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -72,7 +72,7 @@
         {
             // Setup
             var stackChartData = new StackChartData();
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             var generalResult = new GeneralResultSubMechanismIllustrationPoint(
                 windDirection,
                 Enumerable.Empty<Stochast>(),
@@ -107,7 +107,7 @@
             const string closingSituationClosed = "Closed";
             const string closingSituationOpen = "Open";
 
-            var windDirection = new TestWindDirection();
+            WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
 
             var stackChartData = new StackChartData();
             var generalResult = new GeneralResultSubMechanismIllustrationPoint(
@@ -164,12 +164,12 @@
         {
             var stackChartData = new StackChartData();
             var generalResult = new GeneralResultSubMechanismIllustrationPoint(
-               new TestWindDirection(),
-               Enumerable.Empty<Stochast>(),
+                WindDirectionTestFactory.CreateTestWindDirection(),
+            Enumerable.Empty<Stochast>(),
                new[]
                {
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                       WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 1",
                                               new[]
                                               {
@@ -181,7 +181,7 @@
                                               },
                                               Enumerable.Empty<IllustrationPointResult>(), 1)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 2",
                                               new[]
                                               {
@@ -193,7 +193,7 @@
                                               },
                                               Enumerable.Empty<IllustrationPointResult>(), 1)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 3",
                                               new[]
                                               {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs	(.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs	(.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -55,7 +55,9 @@
                                                                                   Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
                                                                                   Enumerable.Empty<IllustrationPointResult>(),
                                                                                   3);
-            var context = new TopLevelSubMechanismIllustrationPoint(new TestWindDirection(), "direction", submechanismIllustrationPoint);
+            var context = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
+                                                                    "direction",
+                                                                    submechanismIllustrationPoint);
 
             // Call
             var hydraulicBoundaryLocationProperties = new TopLevelSubMechanismIllustrationPointProperties
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointRowTest.cs
===================================================================
diff -u -r29c0d37342d76d0bc06b1696aeaf56a316f86a19 -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointRowTest.cs	(.../IllustrationPointRowTest.cs)	(revision 29c0d37342d76d0bc06b1696aeaf56a316f86a19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointRowTest.cs	(.../IllustrationPointRowTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -47,7 +47,8 @@
         {
             // Setup
             var illustrationPoint = new TopLevelSubMechanismIllustrationPoint(
-                new TestWindDirection(), "Regular",
+                WindDirectionTestFactory.CreateTestWindDirection(),
+                "Regular",
                 new TestSubMechanismIllustrationPoint());
 
             // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs	(.../IllustrationPointsChartControlTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs	(.../IllustrationPointsChartControlTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -130,12 +130,12 @@
 
             // When
             chartControl.Data = new GeneralResultSubMechanismIllustrationPoint(
-                new TestWindDirection(),
+                WindDirectionTestFactory.CreateTestWindDirection(),
                 Enumerable.Empty<Stochast>(),
                 new[]
                 {
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 1",
                                                           new[]
                                                           {
@@ -144,7 +144,7 @@
                                                           },
                                                           Enumerable.Empty<IllustrationPointResult>(), 1)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 2",
                                                           new[]
                                                           {
@@ -167,12 +167,12 @@
         private static GeneralResultSubMechanismIllustrationPoint GetGeneralResult()
         {
             return new GeneralResultSubMechanismIllustrationPoint(
-                new TestWindDirection(),
+                WindDirectionTestFactory.CreateTestWindDirection(),
                 Enumerable.Empty<Stochast>(),
                 new[]
                 {
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 1",
                                                           new[]
                                                           {
@@ -183,7 +183,7 @@
                                                           },
                                                           Enumerable.Empty<IllustrationPointResult>(), 1)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 2",
                                                           new[]
                                                           {
@@ -194,7 +194,7 @@
                                                           },
                                                           Enumerable.Empty<IllustrationPointResult>(), 1)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Punt 3",
                                                           new[]
                                                           {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs
===================================================================
diff -u -r29c0d37342d76d0bc06b1696aeaf56a316f86a19 -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs	(.../IllustrationPointsTableControlTest.cs)	(revision 29c0d37342d76d0bc06b1696aeaf56a316f86a19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs	(.../IllustrationPointsTableControlTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -134,16 +134,16 @@
         {
             // Setup
             var data = new GeneralResultSubMechanismIllustrationPoint(
-                new TestWindDirection(),
+                WindDirectionTestFactory.CreateTestWindDirection(),
                 Enumerable.Empty<Stochast>(),
                 new[]
                 {
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Point 1", Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
                                                           Enumerable.Empty<IllustrationPointResult>(), 0.9)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Point 2", Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
                                                           Enumerable.Empty<IllustrationPointResult>(), 0.7))
                 });
@@ -183,7 +183,7 @@
             IllustrationPointsTableControl control = ShowControl();
             control.Data = data;
 
-            var dataGridView = (DataGridView)control.Controls.Find("DataGridView", true).Single();
+            var dataGridView = (DataGridView) control.Controls.Find("DataGridView", true).Single();
             DataGridViewRowCollection rows = dataGridView.Rows;
 
             // Precondition
@@ -204,11 +204,11 @@
             // Given
             IllustrationPointsTableControl control = ShowControl();
             control.Data = GetGeneralResult();
-            
+
             var selectionChangedCount = 0;
             control.SelectionChanged += (sender, args) => selectionChangedCount++;
 
-            var dataGridView = (DataGridView)control.Controls.Find("DataGridView", true)[0];
+            var dataGridView = (DataGridView) control.Controls.Find("DataGridView", true)[0];
 
             // When
             dataGridView.CurrentCell = dataGridView.Rows[1].Cells[calculatedProbabilityColumnIndex];
@@ -236,7 +236,7 @@
             IllustrationPointsTableControl control = ShowControl();
             control.Data = GetGeneralResult();
 
-            var dataGridView = (DataGridView)testForm.Controls.Find("dataGridView", true).First();
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
             selectedLocationRow.Cells[0].Value = true;
 
@@ -262,16 +262,16 @@
         private static GeneralResultSubMechanismIllustrationPoint GetGeneralResult()
         {
             return new GeneralResultSubMechanismIllustrationPoint(
-                new TestWindDirection(),
+                WindDirectionTestFactory.CreateTestWindDirection(),
                 Enumerable.Empty<Stochast>(),
                 new[]
                 {
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Regular",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Regular",
                         new SubMechanismIllustrationPoint("Point 1", Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
                                                           Enumerable.Empty<IllustrationPointResult>(), 0.9)),
                     new TopLevelSubMechanismIllustrationPoint(
-                        new TestWindDirection(), "Open",
+                        WindDirectionTestFactory.CreateTestWindDirection(), "Open",
                         new SubMechanismIllustrationPoint("Point 2", Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
                                                           Enumerable.Empty<IllustrationPointResult>(), 0.7))
                 });
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -ra5c551a343fee7ea3d7e46dd36c82cf180a1b597 -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision a5c551a343fee7ea3d7e46dd36c82cf180a1b597)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -25,7 +25,6 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Rhino.Mocks.Constraints;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.TestUtil;
@@ -205,8 +204,7 @@
 
             var mockRepository = new MockRepository();
             var calculator = mockRepository.Stub<IDesignWaterLevelCalculator>();
-            calculator.Expect(c => c.CalculateWithIllustrationPoints(null))
-                      .Constraints(new TypeOf(typeof(AssessmentLevelCalculationInput)))
+            calculator.Expect(c => c.CalculateWithIllustrationPoints(Arg<AssessmentLevelCalculationInput>.Is.TypeOf))
                       .Throw(expectedException);
             calculator.Stub(c => c.LastErrorFileContent).Return(string.Empty);
             calculator.Stub(c => c.OutputDirectory).Return(string.Empty);
@@ -330,152 +328,24 @@
         }
 
         [Test]
-        public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
         {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            const string locationName = "punt_flw_ 1";
-            const string calculationName = "calculationName";
-            const string calculationFailedMessage = "calculationFailedMessage";
-            const double norm = 1.0 / 30;
-
-            var calculator = new TestDesignWaterLevelCalculator
-            {
-                LastErrorFileContent = "An error occurred",
-                EndInFailure = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IDesignWaterLevelCalculation>();
-            calculation.Stub(c => c.Name).Return(locationName);
-            calculation.Expect(c => c.Id).Return(0);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProvider.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage);
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                var exceptionThrown = false;
-
-                // Call
-                Action call = () =>
-                {
-                    try
-                    {
-                        new DesignWaterLevelCalculationService().Calculate(calculation,
-                                                                           validFilePath,
-                                                                           norm,
-                                                                           calculationMessageProvider);
-                    }
-                    catch (HydraRingCalculationException)
-                    {
-                        exceptionThrown = true;
-                    }
-                };
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    StringAssert.StartsWith(calculationFailedMessage, msgs[1]);
-                    StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsTrue(exceptionThrown);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException()
+            nameof(Run_InvalidCalculation_LogsErrorAndThrowException)
+        })]
+        public void Run_InvalidCalculation_LogsErrorAndThrowException(bool endInFailure, string lastErrorFileContent, string detailedReport)
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             const string locationName = "punt_flw_ 1";
             const string calculationName = "calculationName";
-            const string calculationFailedUnexplainedMessage = "calculationFailedUnexplainedMessage";
-            const double norm = 1.0 / 30;
-
-            var calculator = new TestDesignWaterLevelCalculator
-            {
-                EndInFailure = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IDesignWaterLevelCalculation>();
-            calculation.Stub(c => c.Name).Return(locationName);
-            calculation.Expect(c => c.Id).Return(0);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProvider.Stub(calc => calc.GetCalculationFailedMessage(locationName, calculator.HydraRingCalculationException.Message))
-                                      .Return(calculationFailedUnexplainedMessage);
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                var exceptionThrown = false;
-
-                // Call
-                Action call = () =>
-                {
-                    try
-                    {
-                        new DesignWaterLevelCalculationService().Calculate(calculation,
-                                                                           validFilePath,
-                                                                           norm,
-                                                                           calculationMessageProvider);
-                    }
-                    catch (HydraRingCalculationException)
-                    {
-                        exceptionThrown = true;
-                    }
-                };
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    StringAssert.StartsWith(calculationFailedUnexplainedMessage, msgs[1]);
-                    StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsTrue(exceptionThrown);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_CalculationFailedWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException()
-        {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            const string locationName = "punt_flw_ 1";
-            const string calculationName = "calculationName";
             const string calculationFailedMessage = "calculationFailedMessage";
             const double norm = 1.0 / 30;
 
             var calculator = new TestDesignWaterLevelCalculator
             {
-                EndInFailure = false,
-                LastErrorFileContent = "An error occurred"
+                LastErrorFileContent = lastErrorFileContent,
+                EndInFailure = endInFailure
             };
 
             var mockRepository = new MockRepository();
@@ -489,13 +359,16 @@
 
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProvider.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage);
+            calculationMessageProvider.Expect(calc => calc.GetCalculationFailedMessage(locationName,
+                                                                                       endInFailure && string.IsNullOrEmpty(lastErrorFileContent)
+                                                                                           ? calculator.HydraRingCalculationException.Message
+                                                                                           : lastErrorFileContent
+                                              )).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var exceptionThrown = false;
-                string exceptionMessage = string.Empty;
+                HydraRingCalculationException exception = null;
 
                 // Call
                 Action call = () =>
@@ -509,8 +382,7 @@
                     }
                     catch (HydraRingCalculationException e)
                     {
-                        exceptionThrown = true;
-                        exceptionMessage = e.Message;
+                        exception = e;
                     }
                 };
 
@@ -520,12 +392,13 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(4, msgs.Length);
                     CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    StringAssert.StartsWith(calculationFailedMessage, msgs[1]);
-                    StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[2]);
+                    Assert.AreEqual(calculationFailedMessage, msgs[1]);
+                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
                     CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
                 });
-                Assert.IsTrue(exceptionThrown);
-                Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage);
+
+                Assert.IsInstanceOf<HydraRingCalculationException>(exception);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs	(.../CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs	(.../CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -59,19 +59,18 @@
         {
             // Setup
             var random = new Random(21);
-            double angle = random.NextDouble();
-            var hydraGoverningWindDirection = new HydraRingWindDirection("Name", angle);
+            var hydraGoverningWindDirection = new HydraRingWindDirection("Name", random.NextDouble());
 
-            var hydraRingGeneralResult =
-                new HydraRingGeneralResult(random.NextDouble(),
-                                           hydraGoverningWindDirection,
-                                           Enumerable.Empty<HydraRingStochast>(),
-                                           new Dictionary<
-                                               HydraRingWindDirectionClosingSituation,
-                                               HydraRingIllustrationPointTreeNode>());
+            var hydraRingGeneralResult = new HydraRingGeneralResult(
+                random.NextDouble(),
+                hydraGoverningWindDirection,
+                Enumerable.Empty<HydraRingStochast>(),
+                new Dictionary<
+                    HydraRingWindDirectionClosingSituation,
+                    HydraRingIllustrationPointTreeNode>());
 
             // Call
-            GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint = 
+            GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint =
                 GeneralResultSubmechanismIllustrationPointConverter.CreateGeneralResultSubmechanismIllustrationPoint(hydraRingGeneralResult);
 
             // Assert
@@ -87,34 +86,32 @@
             const string closingSituation = "Closing situation";
 
             var random = new Random(21);
-            double windDirectionAngle = random.NextDouble();
-            var hydraRingWindDirection = new HydraRingWindDirection("SSE", windDirectionAngle);
-            var hydraRingWindDirectionClosingSituation =
-                new HydraRingWindDirectionClosingSituation(hydraRingWindDirection, closingSituation);
+            var hydraRingWindDirection = new HydraRingWindDirection("SSE", random.NextDouble());
+            var hydraRingWindDirectionClosingSituation = new HydraRingWindDirectionClosingSituation(
+                hydraRingWindDirection, closingSituation);
 
-            double beta = random.NextDouble();
-            var hydraRingIllustrationPoint =
-                new HydraRingSubMechanismIllustrationPoint("Illustration Point",
-                                                           Enumerable.Empty<HydraRingSubMechanismIllustrationPointStochast>(),
-                                                           Enumerable.Empty<HydraRingIllustrationPointResult>(),
-                                                           beta);
+            var hydraRingIllustrationPoint = new HydraRingSubMechanismIllustrationPoint(
+                "Illustration Point",
+                Enumerable.Empty<HydraRingSubMechanismIllustrationPointStochast>(),
+                Enumerable.Empty<HydraRingIllustrationPointResult>(),
+                random.NextDouble());
             var hydraRingIllustrationTreeNode = new HydraRingIllustrationPointTreeNode(hydraRingIllustrationPoint);
 
             double governingWindDirectionAngle = random.NextDouble();
             var governingHydraWindDirection = new HydraRingWindDirection("Name", governingWindDirectionAngle);
-            var hydraGeneralResult =
-                new HydraRingGeneralResult(random.NextDouble(),
-                                           governingHydraWindDirection,
-                                           Enumerable.Empty<HydraRingStochast>(),
-                                           new Dictionary<HydraRingWindDirectionClosingSituation, HydraRingIllustrationPointTreeNode>
-                                           {
-                                               {
-                                                   hydraRingWindDirectionClosingSituation, hydraRingIllustrationTreeNode
-                                               }
-                                           });
+            var hydraGeneralResult = new HydraRingGeneralResult(
+                random.NextDouble(),
+                governingHydraWindDirection,
+                Enumerable.Empty<HydraRingStochast>(),
+                new Dictionary<HydraRingWindDirectionClosingSituation, HydraRingIllustrationPointTreeNode>
+                {
+                    {
+                        hydraRingWindDirectionClosingSituation, hydraRingIllustrationTreeNode
+                    }
+                });
 
             // Call
-            GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint = 
+            GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint =
                 GeneralResultSubmechanismIllustrationPointConverter.CreateGeneralResultSubmechanismIllustrationPoint(hydraGeneralResult);
 
             // Assert
@@ -141,32 +138,34 @@
             var random = new Random(21);
 
             const string closingSituation = "Closing situation";
-            double windDirectionAngle = random.NextDouble();
-            var hydraRingWindDirection = new HydraRingWindDirection("SSE", windDirectionAngle);
-            var hydraRingWindDirectionClosingSituation =
-                new HydraRingWindDirectionClosingSituation(hydraRingWindDirection, closingSituation);
+            var hydraRingWindDirection = new HydraRingWindDirection("SSE", random.NextDouble());
+            var hydraRingWindDirectionClosingSituation = new HydraRingWindDirectionClosingSituation(
+                hydraRingWindDirection,
+                closingSituation);
 
-            var hydraRingIllustrationPoint =
-                new HydraRingFaultTreeIllustrationPoint(" IllustrationPoint",
-                                                        random.NextDouble(),
-                                                        random.NextEnumValue<HydraRingCombinationType>());
+            var hydraRingIllustrationPoint = new HydraRingFaultTreeIllustrationPoint(
+                "IllustrationPoint",
+                random.NextDouble(),
+                random.NextEnumValue<HydraRingCombinationType>());
             var hydraRingIllustrationTreeNode = new HydraRingIllustrationPointTreeNode(hydraRingIllustrationPoint);
 
             double governingWindDirectionAngle = random.NextDouble();
-            var governingHydraRingWindDirection = new HydraRingWindDirection("Name", governingWindDirectionAngle);
-            var hydraRingGeneralResult =
-                new HydraRingGeneralResult(random.NextDouble(),
-                                           governingHydraRingWindDirection,
-                                           Enumerable.Empty<HydraRingStochast>(),
-                                           new Dictionary<HydraRingWindDirectionClosingSituation, HydraRingIllustrationPointTreeNode>
-                                           {
-                                               {
-                                                   hydraRingWindDirectionClosingSituation, hydraRingIllustrationTreeNode
-                                               }
-                                           });
+            var governingHydraRingWindDirection = new HydraRingWindDirection(
+                "Name",
+                governingWindDirectionAngle);
+            var hydraRingGeneralResult = new HydraRingGeneralResult(
+                random.NextDouble(),
+                governingHydraRingWindDirection,
+                Enumerable.Empty<HydraRingStochast>(),
+                new Dictionary<HydraRingWindDirectionClosingSituation, HydraRingIllustrationPointTreeNode>
+                {
+                    {
+                        hydraRingWindDirectionClosingSituation, hydraRingIllustrationTreeNode
+                    }
+                });
 
             // Call
-            GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint = 
+            GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint =
                 GeneralResultSubmechanismIllustrationPointConverter.CreateGeneralResultSubmechanismIllustrationPoint(hydraRingGeneralResult);
 
             // Assert
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs
===================================================================
diff -u -r7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs	(.../SubMechanismIllustrationPointConverterTest.cs)	(revision 7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs	(.../SubMechanismIllustrationPointConverterTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -35,7 +35,7 @@
     public class SubMechanismIllustrationPointConverterTest
     {
         [Test]
-        public void CreateCreateIllustrationPoint_HydraRingSubMechanismIllustrationPointNull_ThrowsArgumentNullException()
+        public void CreateIllustrationPoint_HydraRingSubMechanismIllustrationPointNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => SubMechanismIllustrationPointConverter.CreateSubMechanismIllustrationPoint(null);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionConverterTest.cs
===================================================================
diff -u -r7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionConverterTest.cs	(.../WindDirectionConverterTest.cs)	(revision 7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionConverterTest.cs	(.../WindDirectionConverterTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -47,8 +47,7 @@
         {
             // Setup
             var random = new Random(21);
-            double angle = random.NextDouble();
-            var hydraRingWindDirection = new HydraRingWindDirection("name", angle);
+            var hydraRingWindDirection = new HydraRingWindDirection("name", random.NextDouble());
 
             // Call
             WindDirection windDirection = WindDirectionConverter.CreateWindDirection(hydraRingWindDirection);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -ra5c551a343fee7ea3d7e46dd36c82cf180a1b597 -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision a5c551a343fee7ea3d7e46dd36c82cf180a1b597)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -25,7 +25,6 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Rhino.Mocks.Constraints;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.TestUtil;
@@ -204,8 +203,7 @@
 
             var mockRepository = new MockRepository();
             var calculator = mockRepository.Stub<IWaveHeightCalculator>();
-            calculator.Expect(c => c.CalculateWithIllustrationPoints(null))
-                      .Constraints(new TypeOf(typeof(WaveHeightCalculationInput)))
+            calculator.Expect(c => c.CalculateWithIllustrationPoints(Arg<WaveHeightCalculationInput>.Is.TypeOf))
                       .Throw(expectedException);
             calculator.Stub(c => c.LastErrorFileContent).Return(string.Empty);
             calculator.Stub(c => c.OutputDirectory).Return(string.Empty);
@@ -328,152 +326,24 @@
         }
 
         [Test]
-        public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
         {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            const string locationName = "punt_flw_ 1";
-            const string calculationName = "calculationName";
-            const string calculationFailedMessage = "calculationFailedMessage";
-            const double norm = 1.0 / 30;
-
-            var calculator = new TestWaveHeightCalculator
-            {
-                LastErrorFileContent = "An error occurred",
-                EndInFailure = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IWaveHeightCalculation>();
-            calculation.Stub(c => c.Name).Return(locationName);
-            calculation.Expect(c => c.Id).Return(0);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProvider.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage);
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                var exceptionThrown = false;
-
-                // Call
-                Action call = () =>
-                {
-                    try
-                    {
-                        new WaveHeightCalculationService().Calculate(calculation,
-                                                                     validFilePath,
-                                                                     norm,
-                                                                     calculationMessageProvider);
-                    }
-                    catch (HydraRingCalculationException)
-                    {
-                        exceptionThrown = true;
-                    }
-                };
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    StringAssert.StartsWith(calculationFailedMessage, msgs[1]);
-                    StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsTrue(exceptionThrown);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException()
+            nameof(Run_InvalidCalculation_LogsErrorAndThrowException)
+        })]
+        public void Run_InvalidCalculation_LogsErrorAndThrowException(bool endInFailure, string lastErrorFileContent, string detailedReport)
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             const string locationName = "punt_flw_ 1";
             const string calculationName = "calculationName";
-            const string calculationFailedUnexplainedMessage = "calculationFailedUnexplainedMessage";
-            const double norm = 1.0 / 30;
-
-            var calculator = new TestWaveHeightCalculator
-            {
-                EndInFailure = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IWaveHeightCalculation>();
-            calculation.Stub(c => c.Name).Return(locationName);
-            calculation.Expect(c => c.Id).Return(0);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProvider.Stub(calc => calc.GetCalculationFailedMessage(locationName, calculator.HydraRingCalculationException.Message))
-                                      .Return(calculationFailedUnexplainedMessage);
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                var exceptionThrown = false;
-
-                // Call
-                Action call = () =>
-                {
-                    try
-                    {
-                        new WaveHeightCalculationService().Calculate(calculation,
-                                                                     validFilePath,
-                                                                     norm,
-                                                                     calculationMessageProvider);
-                    }
-                    catch (HydraRingCalculationException)
-                    {
-                        exceptionThrown = true;
-                    }
-                };
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    StringAssert.StartsWith(calculationFailedUnexplainedMessage, msgs[1]);
-                    StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsTrue(exceptionThrown);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_CalculationFailedWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException()
-        {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            const string locationName = "punt_flw_ 1";
-            const string calculationName = "calculationName";
             const string calculationFailedMessage = "calculationFailedMessage";
             const double norm = 1.0 / 30;
 
             var calculator = new TestWaveHeightCalculator
             {
-                LastErrorFileContent = "An error occurred",
-                EndInFailure = false
+                LastErrorFileContent = lastErrorFileContent,
+                EndInFailure = endInFailure
             };
 
             var mockRepository = new MockRepository();
@@ -487,13 +357,16 @@
 
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProvider.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage);
+            calculationMessageProvider.Expect(calc => calc.GetCalculationFailedMessage(locationName,
+                                                                                       endInFailure && string.IsNullOrEmpty(lastErrorFileContent)
+                                                                                           ? calculator.HydraRingCalculationException.Message
+                                                                                           : lastErrorFileContent
+                                              )).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                var exceptionThrown = false;
-                string exceptionMessage = string.Empty;
+                HydraRingCalculationException exception = null;
 
                 // Call
                 Action call = () =>
@@ -507,8 +380,7 @@
                     }
                     catch (HydraRingCalculationException e)
                     {
-                        exceptionThrown = true;
-                        exceptionMessage = e.Message;
+                        exception = e;
                     }
                 };
 
@@ -518,12 +390,12 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(4, msgs.Length);
                     CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    StringAssert.StartsWith(calculationFailedMessage, msgs[1]);
-                    StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[2]);
+                    Assert.AreEqual(calculationFailedMessage, msgs[1]);
+                    Assert.AreEqual($"Golfhoogte berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
                     CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
                 });
-                Assert.IsTrue(exceptionThrown);
-                Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage);
+                Assert.IsInstanceOf<HydraRingCalculationException>(exception);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationTest.cs
===================================================================
diff -u -r8cc644609de02fddbdc3259cebd745e299e7444f -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationTest.cs	(.../DuneLocationTest.cs)	(revision 8cc644609de02fddbdc3259cebd745e299e7444f)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationTest.cs	(.../DuneLocationTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -22,9 +22,11 @@
 using System;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.DuneErosion.Data.TestUtil;
 
 namespace Ringtoets.DuneErosion.Data.Test
 {
@@ -134,12 +136,12 @@
         }
 
         [Test]
-        [TestCase(CalculationConvergence.CalculatedConverged)]
-        [TestCase(CalculationConvergence.CalculatedNotConverged)]
-        public void Output_ValidOutput_SetsOutputAndCalculationConvergence(CalculationConvergence converged)
+        public void Output_ValidOutput_SetsOutputAndCalculationConvergence()
         {
             // Setup
-            var duneLocation = new DuneLocation(0, "dune", new Point2D(0, 0), new DuneLocation.ConstructionProperties());
+            var random = new Random(12);
+            var duneLocation = new TestDuneLocation("dune");
+            var converged = random.NextEnumValue<CalculationConvergence>();
             var output = new DuneLocationOutput(converged,
                                                 new DuneLocationOutput.ConstructionProperties());
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj
===================================================================
diff -u -r8aeff3f1153aaac2b2980ca207e298b6d764947b -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj	(.../Ringtoets.DuneErosion.Data.Test.csproj)	(revision 8aeff3f1153aaac2b2980ca207e298b6d764947b)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj	(.../Ringtoets.DuneErosion.Data.Test.csproj)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -88,6 +88,10 @@
       <Project>{D1068432-C172-4AA6-847B-D9DEB4C6DE26}</Project>
       <Name>Ringtoets.DuneErosion.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.DuneErosion.Data.TestUtil\Ringtoets.DuneErosion.Data.TestUtil.csproj">
+      <Project>{7BE6B522-02E3-4143-8508-C021A211DE54}</Project>
+      <Name>Ringtoets.DuneErosion.Data.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -103,7 +103,7 @@
             // Call
             GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
 
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
             selectedLocationRow.Cells[0].Value = true;
 
@@ -121,47 +121,44 @@
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(0, 1));
 
             // Assert
-            Assert.IsNull(control.Data);
+            Assert.IsNull(illustrationPointsControl.Data);
         }
 
         [Test]
         public void Selection_LocationWithoutGeneralResult_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(1, 0));
 
             // Assert
-            Assert.IsNull(control.Data);
+            Assert.IsNull(illustrationPointsControl.Data);
         }
 
         [Test]
         public void Selection_LocationWithGeneralResult_GeneralResultSetOnIllustrationPointsControlData()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(4, 0));
 
             // Assert
-            Assert.IsNotNull(control.Data);
+            Assert.IsNotNull(illustrationPointsControl.Data);
         }
 
         [Test]
@@ -171,7 +168,7 @@
             ShowDesignWaterLevelLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridView dataGridView = GetDataGridView();
             Assert.AreEqual(6, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
@@ -238,7 +235,7 @@
             ShowFullyConfiguredDesignWaterLevelLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRowCollection rows = dataGridView.Rows;
             Assert.AreEqual(5, rows.Count);
 
@@ -296,7 +293,7 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridView dataGridView = GetDataGridView();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -342,7 +339,7 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRowCollection rows = dataGridView.Rows;
             Assert.AreEqual(5, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
@@ -377,7 +374,7 @@
             // Setup
             GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridView dataGridView = GetDataGridView();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -438,7 +435,7 @@
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
 
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -466,7 +463,7 @@
             // When
             if (rowSelected)
             {
-                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+                DataGridViewControl dataGridView = GetDataGridViewControl();
                 DataGridViewRowCollection rows = dataGridView.Rows;
                 rows[0].Cells[locationCalculateColumnIndex].Value = true;
             }
@@ -490,10 +487,9 @@
         {
             // Setup
             GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var illustrationPointsControl = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
 
             // Precondition
@@ -513,6 +509,32 @@
             Assert.AreSame(result, illustrationPointsControl.Data);
         }
 
+        private DataGridViewControl GetDataGridViewControl()
+        {
+            return GetControls<DataGridViewControl>("DataGridViewControl").First();
+        }
+
+        private DataGridView GetDataGridView()
+        {
+            return GetControls<DataGridView>("DataGridView").First();
+        }
+
+        private IllustrationPointsControl GetIllustrationPointsControl()
+        {
+            return GetControls<IllustrationPointsControl>("IllustrationPointsControl").Single();
+        }
+
+        /// <summary>
+        /// Gets the controls by name.
+        /// </summary>
+        /// <param name="controlName">The name of the controls.</param>
+        /// <returns>The found control.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="controlName"/> is <c>null</c> or empty.</exception>
+        private IEnumerable<TView> GetControls<TView>(string controlName) where TView : Control
+        {
+            return testForm.Controls.Find(controlName, true).Cast<TView>();
+        }
+
         private GrassCoverErosionOutwardsDesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView()
         {
             var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -103,7 +103,7 @@
             // Call
             GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
 
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
             selectedLocationRow.Cells[0].Value = true;
 
@@ -121,47 +121,44 @@
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(0, 1));
 
             // Assert
-            Assert.IsNull(control.Data);
+            Assert.IsNull(illustrationPointsControl.Data);
         }
 
         [Test]
         public void Selection_LocationWithoutGeneralResult_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(1, 0));
 
             // Assert
-            Assert.IsNull(control.Data);
+            Assert.IsNull(illustrationPointsControl.Data);
         }
 
         [Test]
         public void Selection_LocationWithGeneralResult_GeneralResultSetOnIllustrationPointsControlData()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(4, 0));
 
             // Assert
-            Assert.IsNotNull(control.Data);
+            Assert.IsNotNull(illustrationPointsControl.Data);
         }
 
         [Test]
@@ -171,7 +168,7 @@
             ShowWaveHeightLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridView dataGridView = GetDataGridView();
             Assert.AreEqual(6, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
@@ -238,7 +235,7 @@
             ShowFullyConfiguredWaveHeightLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRowCollection rows = dataGridView.Rows;
             Assert.AreEqual(5, rows.Count);
 
@@ -296,7 +293,7 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridView dataGridView = GetDataGridView();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -342,7 +339,7 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRowCollection rows = dataGridView.Rows;
             Assert.AreEqual(5, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
@@ -372,7 +369,7 @@
             // Setup
             GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridView dataGridView = GetDataGridView();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -433,7 +430,7 @@
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
 
-            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -461,7 +458,7 @@
             // When
             if (rowSelected)
             {
-                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+                DataGridViewControl dataGridView = GetDataGridViewControl();
                 DataGridViewRowCollection rows = dataGridView.Rows;
                 rows[0].Cells[locationCalculateColumnIndex].Value = true;
             }
@@ -485,10 +482,9 @@
         {
             // Setup
             GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
-            var illustrationPointsControl = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
 
-            var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
-
             dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
 
             // Precondition
@@ -508,6 +504,32 @@
             Assert.AreSame(result, illustrationPointsControl.Data);
         }
 
+        private DataGridViewControl GetDataGridViewControl()
+        {
+            return GetControls<DataGridViewControl>("DataGridViewControl").First();
+        }
+
+        private DataGridView GetDataGridView()
+        {
+            return GetControls<DataGridView>("DataGridView").First();
+        }
+
+        private IllustrationPointsControl GetIllustrationPointsControl()
+        {
+            return GetControls<IllustrationPointsControl>("IllustrationPointsControl").Single();
+        }
+
+        /// <summary>
+        /// Gets the controls by name.
+        /// </summary>
+        /// <param name="controlName">The name of the controls.</param>
+        /// <returns>The found control.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="controlName"/> is <c>null</c> or empty.</exception>
+        private IEnumerable<TView> GetControls<TView>(string controlName) where TView : Control
+        {
+            return testForm.Controls.Find(controlName, true).Cast<TView>();
+        }
+
         private GrassCoverErosionOutwardsWaveHeightLocationsView ShowWaveHeightLocationsView()
         {
             var view = new GrassCoverErosionOutwardsWaveHeightLocationsView();
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/GeneralResult.cs
===================================================================
diff -u -r66a40e718fdf95596f8897d81af4a1a0144cfae4 -ref3fadb8742f1c2e60d2278a9d9a4639e1a4f44d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/GeneralResult.cs	(.../GeneralResult.cs)	(revision 66a40e718fdf95596f8897d81af4a1a0144cfae4)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/GeneralResult.cs	(.../GeneralResult.cs)	(revision ef3fadb8742f1c2e60d2278a9d9a4639e1a4f44d)
@@ -35,7 +35,7 @@
         /// <param name="beta">The general beta value.</param>
         /// <param name="governingWindDirection">The governing wind direction.</param>
         /// <param name="stochasts">The general alpha stochast values.</param>
-        /// <param name="illustrationPoints">The tree of illustration points for each wind direction 
+        /// <param name="illustrationPoints">The tree of illustration for each wind direction 
         /// and closing situation.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="governingWindDirection"/>, 
         /// <paramref name="stochasts"/>, or <paramref name="illustrationPoints"/> is <c>null</c>.</exception>