Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8 -r814349430deb526dabf1cd5ac5bd71e0ff3597cb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision 56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using Core.Common.Base;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r814349430deb526dabf1cd5ac5bd71e0ff3597cb
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs	(.../DuneErosionResultView.cs)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs	(.../DuneErosionResultView.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
@@ -51,6 +51,13 @@
             return new DuneErosionSectionResultRow(sectionResult);
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            DataGridViewControl.RemoveCellFormattingHandler(DisableIrrelevantFieldsFormatting);
+
+            base.Dispose(disposing);
+        }
+
         private void AddDataGridColumns()
         {
             EnumDisplayWrapper<AssessmentLayerTwoAResult>[] twoAResultDataSource =
@@ -77,13 +84,6 @@
                 RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            DataGridViewControl.RemoveCellFormattingHandler(DisableIrrelevantFieldsFormatting);
-
-            base.Dispose(disposing);
-        }
-
         private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
         {
             if (eventArgs.ColumnIndex > 1)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r814349430deb526dabf1cd5ac5bd71e0ff3597cb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -r814349430deb526dabf1cd5ac5bd71e0ff3597cb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
@@ -343,7 +343,7 @@
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
                     using (new HydraRingCalculatorFactoryConfig())
                     {
-                        ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator.EndInFailure = true;
+                        ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator.EndInFailure = true;
 
                         // When
                         contextMenuAdapter.Items[contextMenuRunAssessmentLevelCalculationsIndex].PerformClick();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r814349430deb526dabf1cd5ac5bd71e0ff3597cb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs	(.../DuneErosionResultViewTest.cs)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs	(.../DuneErosionResultViewTest.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
@@ -119,7 +119,7 @@
                 var cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
-                Assert.IsTrue((bool)cells[assessmentLayerOneIndex].Value);
+                Assert.IsTrue((bool) cells[assessmentLayerOneIndex].Value);
                 Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value);
                 Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r814349430deb526dabf1cd5ac5bd71e0ff3597cb
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
@@ -210,8 +210,8 @@
             IEnumerable<ICalculation> affectedItems = RingtoetsDataSynchronizationService.ClearFailureMechanismCalculationOutputs(assessmentSection);
 
             // Assert
-            StructuresCalculation<HeightStructuresInput> calculation1 = (StructuresCalculation<HeightStructuresInput>)failureMechanism1.CalculationsGroup.Children[0];
-            StructuresCalculation<HeightStructuresInput> calculation2 = (StructuresCalculation<HeightStructuresInput>)failureMechanism2.CalculationsGroup.Children[0];
+            StructuresCalculation<HeightStructuresInput> calculation1 = (StructuresCalculation<HeightStructuresInput>) failureMechanism1.CalculationsGroup.Children[0];
+            StructuresCalculation<HeightStructuresInput> calculation2 = (StructuresCalculation<HeightStructuresInput>) failureMechanism2.CalculationsGroup.Children[0];
             Assert.IsNull(calculation1.Output);
             Assert.IsNull(calculation2.Output);
             CollectionAssert.AreEqual(new[]