Index: Core/Common/src/Core.Common.Base/ObservableList.cs
===================================================================
diff -u -r421cbbc8a7149960b5e6908bde1744c63e4d1169 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Core/Common/src/Core.Common.Base/ObservableList.cs	(.../ObservableList.cs)	(revision 421cbbc8a7149960b5e6908bde1744c63e4d1169)
+++ Core/Common/src/Core.Common.Base/ObservableList.cs	(.../ObservableList.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -26,7 +26,7 @@
 namespace Core.Common.Base
 {
     /// <summary>
-    /// Class that extends the <see cref="List{T}"/> class with an implementation of <see cref="IObservable"/>.
+    /// Class that extends the <see cref="List{T}"/> class with an implementation of <see cref="IObservableEnumerable{T}"/>.
     /// </summary>
     /// <typeparam name="T">The type of elements in the list.</typeparam>
     public class ObservableList<T> : List<T>, IObservableEnumerable<T>
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs	(.../ClosingStructuresFailureMechanismResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs	(.../ClosingStructuresFailureMechanismResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -36,7 +36,8 @@
     /// <summary>
     /// The view for a collection of <see cref="StructuresFailureMechanismSectionResult{T}"/> for closing structures.
     /// </summary>
-    public class ClosingStructuresFailureMechanismResultView : FailureMechanismResultView<ClosingStructuresFailureMechanism, StructuresFailureMechanismSectionResult<ClosingStructuresInput>>
+    public class ClosingStructuresFailureMechanismResultView 
+        : FailureMechanismResultView<ClosingStructuresFailureMechanism, StructuresFailureMechanismSectionResult<ClosingStructuresInput>>
     {
         private const int assessmentLayerTwoAIndex = 2;
         private readonly IAssessmentSection assessmentSection;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,10 +21,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -206,7 +206,7 @@
         [Test]
         public void FailureMechanismResultView_WithClosingStructuresFailureMechanismSectionResultAssigned_SectionsAddedAsRows()
         {
-            // Given
+            // Setup
             var section1 = new FailureMechanismSection("Section 1", new[]
             {
                 new Point2D(0, 0)
@@ -237,6 +237,7 @@
                 AssessmentLayerThree = random.NextRoundedDouble()
             };
 
+            // Call
             using (ShowFailureMechanismResultsView(new ObservableList<StructuresFailureMechanismSectionResult<ClosingStructuresInput>>
             {
                 result1,
@@ -462,6 +463,7 @@
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
             StructuresFailureMechanismSectionResult<ClosingStructuresInput> sectionResult, string expectedValue)
         {
+            // Given
             using (ShowFailureMechanismResultsView(new ObservableList<StructuresFailureMechanismSectionResult<ClosingStructuresInput>>
             {
                 sectionResult
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs
===================================================================
diff -u -r09d20758dff97aed16e0d04399c803097eb1d28c -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs	(.../FailureMechanismSectionsImporterTest.cs)	(revision 09d20758dff97aed16e0d04399c803097eb1d28c)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs	(.../FailureMechanismSectionsImporterTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -103,9 +103,7 @@
                                                                  Path.Combine("FailureMechanismSections", sectionsFileName));
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
-
-            var failureMechanism = new Simple();
-
+            var failureMechanism = new SimpleFailureMechanism();
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
             // Call
@@ -130,7 +128,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("A", importReferenceLine.Points));
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -156,7 +154,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -184,7 +182,7 @@
 
             var progressChangeNotifications = new List<ProgressNotification>();
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
             importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
@@ -215,7 +213,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -241,7 +239,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -269,7 +267,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -299,7 +297,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -329,7 +327,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -356,7 +354,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -383,7 +381,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
 
@@ -406,7 +404,7 @@
             string sectionsFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
                                                                  Path.Combine("FailureMechanismSections", "vakindeling_Empty_Name_Value.shp"));
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, new ReferenceLine(), sectionsFilePath);
 
@@ -433,7 +431,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
             importer.SetProgressChanged((description, step, steps) =>
@@ -466,7 +464,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
             importer.SetProgressChanged((description, step, steps) =>
@@ -499,7 +497,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
             importer.SetProgressChanged((description, step, steps) =>
@@ -532,7 +530,7 @@
 
             ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
 
-            var failureMechanism = new Simple();
+            var failureMechanism = new SimpleFailureMechanism();
 
             var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath);
             importer.SetProgressChanged((description, step, steps) => importer.Cancel());
@@ -664,9 +662,9 @@
             }
         }
 
-        private class Simple : FailureMechanismBase
+        private class SimpleFailureMechanism : FailureMechanismBase
         {
-            public Simple() : base("Stubbed name", "Stubbed code") {}
+            public SimpleFailureMechanism() : base("Stubbed name", "Stubbed code") {}
 
             public override IEnumerable<ICalculation> Calculations
             {
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs	(.../DuneErosionFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs	(.../DuneErosionFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj
===================================================================
diff -u -r29907f7ee9dabab5cfb9a8ca2103da5e5bcc1a90 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj	(.../Ringtoets.DuneErosion.Data.Test.csproj)	(revision 29907f7ee9dabab5cfb9a8ca2103da5e5bcc1a90)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj	(.../Ringtoets.DuneErosion.Data.Test.csproj)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -11,9 +11,6 @@
       <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -54,9 +51,5 @@
       <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>
 </Project>
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/packages.config
===================================================================
diff -u -r29907f7ee9dabab5cfb9a8ca2103da5e5bcc1a90 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/packages.config	(.../packages.config)	(revision 29907f7ee9dabab5cfb9a8ca2103da5e5bcc1a90)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/packages.config	(.../packages.config)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -23,5 +23,4 @@
 -->
 <packages>
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
-  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -102,12 +102,8 @@
 
         protected override object CreateFailureMechanismSectionResultRow(GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult)
         {
-            if (FailureMechanism == null)
-            {
-                return null;
-            }
-
-            return new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, FailureMechanism,
+            return new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, 
+                                                                                FailureMechanism,
                                                                                 assessmentSection);
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r16a12e1f4fc8f71595b2bc36de24655fbd4ac7d3 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs)	(revision 16a12e1f4fc8f71595b2bc36de24655fbd4ac7d3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -24,7 +24,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.GrassCoverErosionInwards.Data.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionInwards.Data.Test
 {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -409,6 +409,7 @@
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
             GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult, string expectedValue)
         {
+            // Given
             using (ShowFailureMechanismResultsView(
                 new ObservableList<GrassCoverErosionInwardsFailureMechanismSectionResult>
                 {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -84,7 +84,13 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
-        public IObservableEnumerable<GrassCoverErosionOutwardsFailureMechanismSectionResult> SectionResults => sectionResults;
+        public IObservableEnumerable<GrassCoverErosionOutwardsFailureMechanismSectionResult> SectionResults
+        {
+            get
+            {
+                return sectionResults;
+            }
+        }
 
         public override void AddSection(FailureMechanismSection section)
         {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -70,7 +70,7 @@
                 {
                     form.Controls.Add(view);
 
-                    // Call
+                    // When
                     form.Show();
 
                     // Then
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -104,12 +104,9 @@
 
         protected override object CreateFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult)
         {
-            if (FailureMechanism == null)
-            {
-                return null;
-            }
-
-            return new HeightStructuresFailureMechanismSectionResultRow(sectionResult, FailureMechanism, assessmentSection);
+            return new HeightStructuresFailureMechanismSectionResultRow(sectionResult,
+                                                                        FailureMechanism,
+                                                                        assessmentSection);
         }
 
         protected override void AddDataGridColumns()
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -405,6 +405,7 @@
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
             StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult, string expectedValue)
         {
+            // Given
             using (ShowFailureMechanismResultsView(
                 new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
                 {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs	(.../GrassCoverSlipOffInwardsResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs	(.../GrassCoverSlipOffInwardsResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -36,8 +36,8 @@
     /// <summary>
     /// The view for a collection of <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.
     /// </summary>
-    public class GrassCoverSlipOffInwardsResultView : FailureMechanismResultView<GrassCoverSlipOffInwardsFailureMechanism,
-        GrassCoverSlipOffInwardsFailureMechanismSectionResult>
+    public class GrassCoverSlipOffInwardsResultView
+        : FailureMechanismResultView<GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResult>
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverSlipOffInwardsResultView"/>.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj
===================================================================
diff -u -r45f6ed59c0f37f734395a471935982318d8bf9cf -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj	(.../Ringtoets.Integration.Service.csproj)	(revision 45f6ed59c0f37f734395a471935982318d8bf9cf)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj	(.../Ringtoets.Integration.Service.csproj)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -142,10 +142,6 @@
       <Name>Ringtoets.WaveImpactAsphaltCover.Service</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.Integration.Data\Ringtoets.Integration.Data.csproj">
-      <Project>{11F1F874-45AF-43E4-8AE5-15A5C9593E28}</Project>
-      <Name>Ringtoets.Integration.Data</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs	(.../MacroStabilityOutwardsFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs	(.../MacroStabilityOutwardsFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs	(.../MicrostabilityFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs	(.../MicrostabilityFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs	(.../PipingStructureFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs	(.../PipingStructureFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,12 +21,10 @@
 
 using System;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs	(.../TechnicalInnovationFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs	(.../TechnicalInnovationFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -22,7 +22,6 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
@@ -113,19 +112,19 @@
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
-                AssessmentLayerThree = (RoundedDouble) random.NextDouble()
+                AssessmentLayerThree = random.NextRoundedDouble()
             };
             var result2 = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section2)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.NotAssessed,
                 AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
-                AssessmentLayerThree = (RoundedDouble) random.NextDouble()
+                AssessmentLayerThree = random.NextRoundedDouble()
             };
             var result3 = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section3)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.NoVerdict,
                 AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
-                AssessmentLayerThree = (RoundedDouble) random.NextDouble()
+                AssessmentLayerThree = random.NextRoundedDouble()
             };
             var sectionResults = new ObservableList<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>
             {
@@ -197,7 +196,7 @@
             {
                 AssessmentLayerOne = assessmentLayerOneState,
                 AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
-                AssessmentLayerThree = (RoundedDouble) random.NextDouble()
+                AssessmentLayerThree = random.NextRoundedDouble()
             };
             var sectionResults = new ObservableList<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>
             {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r16a12e1f4fc8f71595b2bc36de24655fbd4ac7d3 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs)	(revision 16a12e1f4fc8f71595b2bc36de24655fbd4ac7d3)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -22,8 +22,6 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 
@@ -36,7 +34,6 @@
         public void Constructor_WithParameters_ExpectedValues()
         {
             // Setup
-            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs	(.../MacroStabilityInwardsFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs	(.../MacroStabilityInwardsFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs
===================================================================
diff -u -r421cbbc8a7149960b5e6908bde1744c63e4d1169 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs	(.../MacroStabilityInwardsTestDataGeneratorHelper.cs)	(revision 421cbbc8a7149960b5e6908bde1744c63e4d1169)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs	(.../MacroStabilityInwardsTestDataGeneratorHelper.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -39,6 +39,8 @@
         /// for the parent and nested calculations with output.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have all expected calculation configurations.</exception>
         public static void AssertHasAllPossibleCalculationConfigurationsWithOutputs(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
@@ -53,6 +55,8 @@
         /// for the parent and nested calculations without output.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have all expected calculation configurations.</exception>
         public static void AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
@@ -66,6 +70,8 @@
         /// Asserts that the <paramref name="failureMechanism"/> contains <see cref="MacroStabilityInwardsStochasticSoilModel"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have stochastic soil models.</exception>
         public static void AssertHasStochasticSoilModels(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             CollectionAssert.IsNotEmpty(failureMechanism.StochasticSoilModels);
@@ -75,6 +81,8 @@
         /// Asserts that the <paramref name="failureMechanism"/> contains <see cref="MacroStabilityInwardsSurfaceLine"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have anysurface lines.</exception>
         public static void AssertHasSurfaceLines(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             CollectionAssert.IsNotEmpty(failureMechanism.SurfaceLines);
@@ -85,6 +93,8 @@
         /// <see cref="MacroStabilityInwardsFailureMechanismSectionResult"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have the expected amount of sections.</exception>
         public static void AssertHasFailureMechanismSections(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             IEnumerable<FailureMechanismSection> sections = failureMechanism.Sections;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 
@@ -120,7 +118,6 @@
         public void AddSection_WithSection_AddedSectionResult()
         {
             // Setup
-
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs
===================================================================
diff -u -r421cbbc8a7149960b5e6908bde1744c63e4d1169 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs	(.../PipingTestDataGeneratorHelper.cs)	(revision 421cbbc8a7149960b5e6908bde1744c63e4d1169)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs	(.../PipingTestDataGeneratorHelper.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -39,6 +39,8 @@
         /// for the parent and nested calculations with output.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have all expected calculation configurations.</exception>
         public static void AssertHasAllPossibleCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
@@ -53,6 +55,8 @@
         /// for the parent and nested calculations without output.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have all expected calculation configurations.</exception>
         public static void AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
@@ -66,6 +70,8 @@
         /// Asserts that the <paramref name="failureMechanism"/> contains <see cref="StochasticSoilModel"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have stochastic soil models.</exception>
         public static void AssertHasStochasticSoilModels(PipingFailureMechanism failureMechanism)
         {
             CollectionAssert.IsNotEmpty(failureMechanism.StochasticSoilModels);
@@ -75,6 +81,8 @@
         /// Asserts that the <paramref name="failureMechanism"/> contains <see cref="PipingSurfaceLine"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have any surface lines.</exception>
         public static void AssertHasSurfaceLines(PipingFailureMechanism failureMechanism)
         {
             CollectionAssert.IsNotEmpty(failureMechanism.SurfaceLines);
@@ -85,6 +93,8 @@
         /// <see cref="PipingFailureMechanismSectionResult"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="failureMechanism"/>
+        /// doesn't have the expected amount of sections.</exception>
         public static void AssertHasFailureMechanismSections(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<FailureMechanismSection> sections = failureMechanism.Sections;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -93,11 +93,6 @@
 
         protected override object CreateFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult)
         {
-            if (FailureMechanism == null)
-            {
-                return null;
-            }
-
             return new StabilityPointStructuresFailureMechanismSectionResultRow(sectionResult,
                                                                                 FailureMechanism,
                                                                                 assessmentSection);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -205,9 +205,9 @@
         }
 
         [Test]
-        public void GivenFormWithFailureMechanismResultView_WhenDataSourceWithFailureMechanismSectionResultAssigned_ThenSectionsAddedAsRows()
+        public void FailureMechanismResultView_WithFailureMechanismSectionResultAssigned_SectionsAddedAsRows()
         {
-            // Given
+            // Setup
             var section1 = new FailureMechanismSection("Section 1", new[]
             {
                 new Point2D(0, 0)
@@ -238,7 +238,7 @@
                 AssessmentLayerThree = random.NextRoundedDouble()
             };
 
-            // When
+            // Call
             using (ShowFailureMechanismResultsView(
                 new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
                 {
@@ -247,7 +247,7 @@
                     result3
                 }))
             {
-                // Then
+                // Assert
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
                 DataGridViewRowCollection rows = dataGridView.Rows;
                 Assert.AreEqual(3, rows.Count);
@@ -464,6 +464,7 @@
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
             StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult, string expectedValue)
         {
+            // Given
             using (ShowFailureMechanismResultsView(
                 new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
                 {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs	(.../StabilityStoneCoverResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs	(.../StabilityStoneCoverResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -46,11 +46,6 @@
             IObservableEnumerable<StabilityStoneCoverFailureMechanismSectionResult> failureMechanismSectionResults)
             : base(failureMechanism, failureMechanismSectionResults)
         {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
             DataGridViewControl.CellFormatting += DisableIrrelevantFieldsFormatting;
             UpdateDataGridViewDataSource();
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs	(.../StabilityStoneCoverFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs	(.../StabilityStoneCoverFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultView.cs)	(revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultView.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -46,13 +46,7 @@
             IObservableEnumerable<WaveImpactAsphaltCoverFailureMechanismSectionResult> failureMechanismSectionResults)
             : base(failureMechanism, failureMechanismSectionResults)
         {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
             DataGridViewControl.CellFormatting += OnCellFormatting;
-
             UpdateDataGridViewDataSource();
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs
===================================================================
diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismTest.cs)	(revision 42c710f0341da1ca4fc911ef8ba502a41073e400)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismTest.cs)	(revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Rhino.Mocks;