Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/IUseForeshore.cs
===================================================================
diff -u -r5e9769061c2802f1182ed502e2a32581cfb68196 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/IUseForeshore.cs	(.../IUseForeshore.cs)	(revision 5e9769061c2802f1182ed502e2a32581cfb68196)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/IUseForeshore.cs	(.../IUseForeshore.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -27,13 +27,13 @@
     /// <summary>
     /// This interface describes properties for the usage of <see cref="ForeshoreProfile"/>.
     /// </summary>
-    public interface IUseForeshore: IObservable
+    public interface IUseForeshore : IObservable
     {
         /// <summary>
         /// Gets or sets a value indicating whether the <see cref="ForeshoreProfile"/> needs to be taken into account.
         /// </summary>
         bool UseForeshore { get; set; }
-        
+
         /// <summary>
         /// Gets the geometry of the foreshore.
         /// </summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculationInput.cs
===================================================================
diff -u -r98158bd52e1e6e72270448f05918ef05f711e3bd -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculationInput.cs	(.../IStructuresCalculationInput.cs)	(revision 98158bd52e1e6e72270448f05918ef05f711e3bd)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculationInput.cs	(.../IStructuresCalculationInput.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -28,7 +28,7 @@
     /// </summary>
     /// <typeparam name="T">The type of the structure which can be assigned to the
     /// calculation.</typeparam>
-    public interface IStructuresCalculationInput<out T> : ICalculationInput where T: StructureBase
+    public interface IStructuresCalculationInput<out T> : ICalculationInput where T : StructureBase
     {
         /// <summary>
         /// Gets the structure.
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs
===================================================================
diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs	(.../StructuresCalculation.cs)	(revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs	(.../StructuresCalculation.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -63,6 +63,11 @@
             }
         }
 
+        public override string ToString()
+        {
+            return Name;
+        }
+
         public void ClearOutput()
         {
             Output = null;
@@ -77,10 +82,5 @@
         {
             return Output;
         }
-
-        public override string ToString()
-        {
-            return Name;
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs
===================================================================
diff -u -rb032df1f10d8f90d59289622f6827f3ac3cb5376 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs	(.../ScenarioSelectionControl.cs)	(revision b032df1f10d8f90d59289622f6827f3ac3cb5376)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs	(.../ScenarioSelectionControl.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -77,7 +77,7 @@
             {
                 dataGridViewControl.SetDataSource(scenarioRows);
 
-                var columnItems = ((DataGridViewComboBoxColumn)dataGridViewControl.GetColumnFromIndex(calculationsColumnIndex)).Items;
+                var columnItems = ((DataGridViewComboBoxColumn) dataGridViewControl.GetColumnFromIndex(calculationsColumnIndex)).Items;
                 var items = calculations.Select(c => new DataGridViewComboBoxItemWrapper<ICalculation>(c));
                 SetItemsOnObjectCollection(columnItems, items.Cast<object>().ToArray());
 
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs
===================================================================
diff -u -raf78b1626ac52972eb1fbd5a3fa598e2e3b00d2d -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs	(.../ProfilesImporter.cs)	(revision af78b1626ac52972eb1fbd5a3fa598e2e3b00d2d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs	(.../ProfilesImporter.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -282,7 +282,7 @@
                         dikeProfileData.Add(data);
                     }
                 }
-                // No need to catch ArgumentException, as prflFilePaths are valid by construction.
+                    // No need to catch ArgumentException, as prflFilePaths are valid by construction.
                 catch (CriticalFileReadException exception)
                 {
                     log.Error(exception.Message);
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs
===================================================================
diff -u -r23925d0f05558876349015afc3f698789699a0e3 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs	(.../HydraRingSettingsDatabaseReader.cs)	(revision 23925d0f05558876349015afc3f698789699a0e3)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs	(.../HydraRingSettingsDatabaseReader.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -58,8 +58,6 @@
 
         private const string timeIntegrationSchemeIdColumn = "TimeIntegrationSchemeID";
 
-        private string locationIdColumn = "LocationID";
-
         private const string locationIdParameterName = "@locationId";
         private const string calculationTypeIdParameterName = "@calculationTypeId";
         private const string mechanismIdParameterName = "@mechanismID";
@@ -69,6 +67,8 @@
         private readonly string excludedLocationsQuery;
         private readonly string timeIntegrationSettingsForLocationAndCalculationTypeQuery;
 
+        private readonly string locationIdColumn = "LocationID";
+
         /// <summary>
         /// Creates a new instance of <see cref="HydraRingSettingsDatabaseReader"/>.
         /// </summary>
@@ -136,7 +136,7 @@
             {
                 throw new InvalidEnumArgumentException("calculationType", (int) calculationType, calculationType.GetType());
             }
-            
+
             var reader = CreateDesignTablesDataReader(locationId, calculationType);
             if (MoveNext(reader))
             {
@@ -193,7 +193,7 @@
         {
             if (!Enum.IsDefined(calculationType.GetType(), calculationType))
             {
-                throw new InvalidEnumArgumentException("calculationType", (int)calculationType, calculationType.GetType());
+                throw new InvalidEnumArgumentException("calculationType", (int) calculationType, calculationType.GetType());
             }
 
             var reader = CreateTimeIntegrationDataReader(locationId, calculationType);
@@ -231,12 +231,12 @@
             {
                 DbType = DbType.Int32,
                 ParameterName = calculationTypeIdParameterName,
-                Value = (int)calculationType
+                Value = (int) calculationType
             };
 
             return CreateDataReader(
                 designTableSettingsForLocationAndCalculationTypeQuery,
-                locationParameter, 
+                locationParameter,
                 typeParameter);
         }
 
@@ -275,7 +275,7 @@
             {
                 DbType = DbType.Int32,
                 ParameterName = calculationTypeIdParameterName,
-                Value = (int)calculationType
+                Value = (int) calculationType
             };
 
             return CreateDataReader(
Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs
===================================================================
diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs	(.../RingtoetsCommonDataCalculationService.cs)	(revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs	(.../RingtoetsCommonDataCalculationService.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -40,8 +40,8 @@
         public static CalculationConvergence CalculationConverged(double reliabilityIndex, double norm)
         {
             return Math.Abs(reliabilityIndex - StatisticsConverter.NormToBeta(norm)) <= 1.0e-3 ?
-                CalculationConvergence.CalculatedConverged : 
-                CalculationConvergence.CalculatedNotConverged;
+                       CalculationConvergence.CalculatedConverged :
+                       CalculationConvergence.CalculatedNotConverged;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/LogNormalDistributionRule.cs
===================================================================
diff -u -r7259f846cac0ed1569ee22d9788ca7c2f3ca6445 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/LogNormalDistributionRule.cs	(.../LogNormalDistributionRule.cs)	(revision 7259f846cac0ed1569ee22d9788ca7c2f3ca6445)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/LogNormalDistributionRule.cs	(.../LogNormalDistributionRule.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -44,24 +44,24 @@
             this.distribution = distribution;
             this.parameterName = parameterName;
         }
-        
+
         public override IEnumerable<string> Validate()
         {
             var validationResults = new List<string>();
 
             if (IsInvalidNumber(distribution.Mean))
             {
                 validationResults.Add(string.Format(RingtoetsCommonServiceResources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_value,
-                                                   parameterName));
+                                                    parameterName));
             }
 
             if (IsInvalidNumber(distribution.StandardDeviation))
             {
                 validationResults.Add(string.Format(RingtoetsCommonServiceResources.DistributionValidationService_ValidateDistribution_StandardDeviation_of_ParameterName_0_must_be_larger_or_equal_to_zero,
-                                                   parameterName));
+                                                    parameterName));
             }
 
             return validationResults;
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/NormalDistributionRule.cs
===================================================================
diff -u -r7259f846cac0ed1569ee22d9788ca7c2f3ca6445 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/NormalDistributionRule.cs	(.../NormalDistributionRule.cs)	(revision 7259f846cac0ed1569ee22d9788ca7c2f3ca6445)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/NormalDistributionRule.cs	(.../NormalDistributionRule.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -44,24 +44,24 @@
             this.distribution = distribution;
             this.parameterName = parameterName;
         }
-        
+
         public override IEnumerable<string> Validate()
         {
             var validationResults = new List<string>();
-            
+
             if (IsInvalidNumber(distribution.Mean))
             {
                 validationResults.Add(string.Format(RingtoetsCommonServiceResources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number,
-                                                   parameterName));
+                                                    parameterName));
             }
 
             if (IsInvalidNumber(distribution.StandardDeviation))
             {
                 validationResults.Add(string.Format(RingtoetsCommonServiceResources.DistributionValidationService_ValidateDistribution_StandardDeviation_of_ParameterName_0_must_be_larger_or_equal_to_zero,
-                                                   parameterName));
+                                                    parameterName));
             }
 
             return validationResults;
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/ValidationRule.cs
===================================================================
diff -u -r7259f846cac0ed1569ee22d9788ca7c2f3ca6445 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/ValidationRule.cs	(.../ValidationRule.cs)	(revision 7259f846cac0ed1569ee22d9788ca7c2f3ca6445)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/ValidationRule.cs	(.../ValidationRule.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -45,4 +45,4 @@
             return double.IsNaN(value) || double.IsInfinity(value);
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/VariationCoefficientNormalDistributionRule.cs
===================================================================
diff -u -r7259f846cac0ed1569ee22d9788ca7c2f3ca6445 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/VariationCoefficientNormalDistributionRule.cs	(.../VariationCoefficientNormalDistributionRule.cs)	(revision 7259f846cac0ed1569ee22d9788ca7c2f3ca6445)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/VariationCoefficientNormalDistributionRule.cs	(.../VariationCoefficientNormalDistributionRule.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -45,24 +45,24 @@
             this.distribution = distribution;
             this.parameterName = parameterName;
         }
-        
+
         public override IEnumerable<string> Validate()
         {
             var validationResults = new List<string>();
-            
+
             if (IsInvalidNumber(distribution.Mean))
             {
                 validationResults.Add(string.Format(RingtoetsCommonServiceResources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number,
-                                                   parameterName));
+                                                    parameterName));
             }
 
             if (IsInvalidNumber(distribution.CoefficientOfVariation))
             {
                 validationResults.Add(string.Format(RingtoetsCommonServiceResources.DistributionValidationService_ValidateDistribution_CoefficientOfVariation_of_ParameterName_0_must_be_larger_or_equal_to_zero,
-                                                   parameterName));
+                                                    parameterName));
             }
 
             return validationResults;
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs
===================================================================
diff -u -r4a43331dbd65968b57983f4a40099d086553b4a7 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs	(.../VariationCoefficientLogNormalDistributionTest.cs)	(revision 4a43331dbd65968b57983f4a40099d086553b4a7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs	(.../VariationCoefficientLogNormalDistributionTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -68,7 +68,7 @@
             var distribution = new VariationCoefficientLogNormalDistribution(2);
 
             // Call
-            distribution.Mean = (RoundedDouble)actualSetValue;
+            distribution.Mean = (RoundedDouble) actualSetValue;
 
             // Assert
             Assert.AreEqual(expectedRoundedValue, distribution.Mean.Value);
@@ -83,7 +83,7 @@
             var distribution = new VariationCoefficientLogNormalDistribution(2);
 
             // Call
-            TestDelegate call = () => distribution.Mean = (RoundedDouble)invalidCoefficient;
+            TestDelegate call = () => distribution.Mean = (RoundedDouble) invalidCoefficient;
 
             // Assert
             string expectedMessage = "Gemiddelde moet groter zijn dan 0.";
@@ -101,7 +101,7 @@
             var distribution = new VariationCoefficientLogNormalDistribution(2);
 
             // Call
-            distribution.CoefficientOfVariation = (RoundedDouble)actualSetValue;
+            distribution.CoefficientOfVariation = (RoundedDouble) actualSetValue;
 
             // Assert
             Assert.AreEqual(expectedRoundedValue, distribution.CoefficientOfVariation.Value);
@@ -116,7 +116,7 @@
             var distribution = new VariationCoefficientLogNormalDistribution(2);
 
             // Call
-            TestDelegate call = () => distribution.CoefficientOfVariation = (RoundedDouble)invalidCoefficient;
+            TestDelegate call = () => distribution.CoefficientOfVariation = (RoundedDouble) invalidCoefficient;
 
             // Assert
             string expectedMessage = "Variatiecoëfficiënt (CV) moet groter zijn dan of gelijk zijn aan 0.";
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs
===================================================================
diff -u -r4a43331dbd65968b57983f4a40099d086553b4a7 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs	(.../VariationCoefficientNormalDistributionTest.cs)	(revision 4a43331dbd65968b57983f4a40099d086553b4a7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs	(.../VariationCoefficientNormalDistributionTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -85,7 +85,7 @@
             var distribution = new VariationCoefficientNormalDistribution(2);
 
             // Call
-            distribution.CoefficientOfVariation = (RoundedDouble)actualSetValue;
+            distribution.CoefficientOfVariation = (RoundedDouble) actualSetValue;
 
             // Assert
             Assert.AreEqual(expectedRoundedValue, distribution.CoefficientOfVariation.Value);
@@ -100,7 +100,7 @@
             var distribution = new VariationCoefficientNormalDistribution(2);
 
             // Call
-            TestDelegate call = () => distribution.CoefficientOfVariation = (RoundedDouble)invalidCoefficient;
+            TestDelegate call = () => distribution.CoefficientOfVariation = (RoundedDouble) invalidCoefficient;
 
             // Assert
             string expectedMessage = "Variatiecoëfficiënt (CV) moet groter zijn dan of gelijk zijn aan 0.";
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs
===================================================================
diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs	(.../StructuresInputBaseTest.cs)	(revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs	(.../StructuresInputBaseTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -199,6 +199,21 @@
 
         #endregion
 
+        private class SimpleStructuresInput : StructuresInputBase<StructureBase>
+        {
+            public bool Updated { get; private set; }
+
+            protected override void UpdateStructureParameters()
+            {
+                Updated = true;
+            }
+        }
+
+        private class SimpleStructure : StructureBase
+        {
+            public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) {}
+        }
+
         #region Schematization
 
         [Test]
@@ -528,20 +543,5 @@
         }
 
         #endregion
-
-        private class SimpleStructuresInput : StructuresInputBase<StructureBase>
-        {
-            public bool Updated { get; private set; }
-
-            protected override void UpdateStructureParameters()
-            {
-                Updated = true;
-            }
-        }
-
-        private class SimpleStructure : StructureBase
-        {
-            public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) { }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CalculationType.cs
===================================================================
diff -u -rcc27fe12a2d3f982685791389aa68fd6ca25fcd0 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CalculationType.cs	(.../CalculationType.cs)	(revision cc27fe12a2d3f982685791389aa68fd6ca25fcd0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CalculationType.cs	(.../CalculationType.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -41,4 +41,4 @@
         /// </summary>
         ForeshoreWithoutBreakWater
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs
===================================================================
diff -u -r438a524144f283209902ae89f058a134380c9538 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(.../FailureMechanismContributionContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(.../FailureMechanismContributionContextTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -22,7 +22,6 @@
 using System;
 using System.Linq;
 using Core.Common.Controls.PresentationObjects;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/InputContextBaseTest.cs
===================================================================
diff -u -r46ef6c094cc1589938bc88bee6f5bdac70233462 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/InputContextBaseTest.cs	(.../InputContextBaseTest.cs)	(revision 46ef6c094cc1589938bc88bee6f5bdac70233462)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/InputContextBaseTest.cs	(.../InputContextBaseTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -80,7 +80,7 @@
             where TFailureMechanism : IFailureMechanism
         {
             public SimpleInputContext(TInput input, TCalculation calculation, TFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
-                : base(input, calculation, failureMechanism, assessmentSection) { }
+                : base(input, calculation, failureMechanism, assessmentSection) {}
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs
===================================================================
diff -u -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs	(.../StructureSelectionDialogTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs	(.../StructureSelectionDialogTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -82,7 +82,7 @@
             // Setup
             using (var viewParent = new Form())
 
-            // Call
+                // Call
             using (var dialog = new StructureSelectionDialog(viewParent, Enumerable.Empty<StructureBase>()))
             {
                 dialog.Show();
@@ -123,7 +123,7 @@
 
             using (var viewParent = new Form())
 
-            // Call
+                // Call
             using (var dialog = new StructureSelectionDialog(viewParent, new[]
             {
                 structure
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -21,7 +21,6 @@
 
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Gui.Commands;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
@@ -1309,7 +1308,7 @@
         }
 
         #endregion
-        
+
         # region Nested types
 
         private class TestFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs
===================================================================
diff -u -r23925d0f05558876349015afc3f698789699a0e3 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs	(.../HydraRingSettingsDatabaseReaderTest.cs)	(revision 23925d0f05558876349015afc3f698789699a0e3)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs	(.../HydraRingSettingsDatabaseReaderTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -36,7 +36,7 @@
         private static readonly string completeDatabaseDataPath = TestHelper.GetTestDataPath(
             TestDataPath.Ringtoets.Common.IO,
             Path.Combine("HydraRingSettingsDatabaseReader", "7_67.config.sqlite"));
-        
+
         private static readonly string emptyDatabaseDataPath = TestHelper.GetTestDataPath(
             TestDataPath.Ringtoets.Common.IO,
             Path.Combine("HydraRingSettingsDatabaseReader", "7_67-empty.config.sqlite"));
@@ -255,7 +255,13 @@
             IEnumerable<long> locations = reader.ReadExcludedLocations();
 
             // Assert
-            CollectionAssert.AreEqual(new [] { 700141, 700142, 700143, 700146 }, locations);
+            CollectionAssert.AreEqual(new[]
+            {
+                700141,
+                700142,
+                700143,
+                700146
+            }, locations);
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/ValidationResultTest.cs
===================================================================
diff -u -r2f6400116d57c2b49f7089dbc9c8cd935c185a36 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/ValidationResultTest.cs	(.../ValidationResultTest.cs)	(revision 2f6400116d57c2b49f7089dbc9c8cd935c185a36)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/ValidationResultTest.cs	(.../ValidationResultTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -30,14 +30,6 @@
     [TestFixture]
     public class ValidationResultTest
     {
-        private List<string> TestMessages()
-        {
-            return new List<string>
-            {
-                "Some text."
-            };
-        }
-
         [Test]
         public void Constructor_ErrorMessagesNull_ThrowsArgumentException()
         {
@@ -93,5 +85,13 @@
             Assert.IsFalse(validationResult.IsValid);
             CollectionAssert.AreEqual(errorMessages, validationResult.ErrorMessages);
         }
+
+        private List<string> TestMessages()
+        {
+            return new List<string>
+            {
+                "Some text."
+            };
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision bd73023d5f8926a411da214fb5ce522056a0e30a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -191,7 +191,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                var testFactory = (TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance;
+                var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance;
                 var testDesignWaterLevelCalculator = testFactory.DesignWaterLevelCalculator;
                 testDesignWaterLevelCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
 
@@ -283,7 +283,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                var testDesignWaterLevelCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator;
+                var testDesignWaterLevelCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator;
                 testDesignWaterLevelCalculator.DesignWaterLevel = expectedDesignWaterLevel;
                 testDesignWaterLevelCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
 
@@ -325,7 +325,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator.EndInFailure = true;
+                ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator.EndInFailure = true;
 
                 // Call
                 Action call = () => activity.Run();
@@ -368,7 +368,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                var testFactory = (TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance;
+                var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance;
                 testFactory.DesignWaterLevelCalculator.ReliabilityIndex = 3;
 
                 Action call = () => activity.Run();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision bd73023d5f8926a411da214fb5ce522056a0e30a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -150,7 +150,7 @@
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
-            
+
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/ValidationRules/UseBreakWaterRuleTest.cs
===================================================================
diff -u -rdc80ceebd52da19d841b46b5300695fd5c83e4a6 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/ValidationRules/UseBreakWaterRuleTest.cs	(.../UseBreakWaterRuleTest.cs)	(revision dc80ceebd52da19d841b46b5300695fd5c83e4a6)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/ValidationRules/UseBreakWaterRuleTest.cs	(.../UseBreakWaterRuleTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -38,7 +38,7 @@
         {
             mockRepository = new MockRepository();
         }
-        
+
         [Test]
         [TestCase(BreakWaterType.Wall)]
         [TestCase(BreakWaterType.Caisson)]
@@ -83,7 +83,6 @@
             mockRepository.VerifyAll();
         }
 
-
         [Test]
         [Combinatorial]
         public void Validate_UseBreakWaterWithInvalidBreakWaterHeight_ErrorMessage(
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision bd73023d5f8926a411da214fb5ce522056a0e30a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -173,7 +173,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                var testFactory = (TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance;
+                var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance;
                 var testWaveHeightCalculator = testFactory.WaveHeightCalculator;
                 testWaveHeightCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
 
@@ -265,7 +265,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                var testWaveHeightCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveHeightCalculator;
+                var testWaveHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator;
                 testWaveHeightCalculator.WaveHeight = expectedWaveHeight;
                 testWaveHeightCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
 
@@ -350,7 +350,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                var testFactory = (TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance;
+                var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance;
                 testFactory.WaveHeightCalculator.ReliabilityIndex = 3;
 
                 // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision bd73023d5f8926a411da214fb5ce522056a0e30a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -30,7 +30,6 @@
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
-using Ringtoets.HydraRing.Calculation.Data.Output;
 using Ringtoets.HydraRing.Calculation.Parsers;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/SectionSegmentsHelperTest.cs
===================================================================
diff -u -r38600213ce6ca43c1819c81dd95c8ce786650ac3 -r18a3f0bab0ce260604820928c136e66abca7daab
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/SectionSegmentsHelperTest.cs	(.../SectionSegmentsHelperTest.cs)	(revision 38600213ce6ca43c1819c81dd95c8ce786650ac3)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/SectionSegmentsHelperTest.cs	(.../SectionSegmentsHelperTest.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
@@ -40,6 +40,7 @@
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("sections", exception.ParamName);
         }
+
         [Test]
         public void MakeSectionSegments_SectionsElementNull_ThrowsArgumentNullException()
         {
@@ -127,7 +128,7 @@
             // Assert
             Assert.IsNull(section);
         }
-        
+
         [Test]
         public void GetSectionForPoint_PointNotOnSection_ReturnClosestSection()
         {
@@ -146,7 +147,7 @@
             SectionSegments[] sectionSegments =
             {
                 new SectionSegments(failureMechanismSection1),
-                new SectionSegments(failureMechanismSection2), 
+                new SectionSegments(failureMechanismSection2),
             };
 
             // Call
@@ -155,7 +156,7 @@
             // Assert
             Assert.AreSame(failureMechanismSection1, sectionForPoint);
         }
-        
+
         [Test]
         public void GetSectionForPoint_PointOnSection_ReturnSection()
         {
@@ -174,7 +175,7 @@
             SectionSegments[] sectionSegments =
             {
                 new SectionSegments(failureMechanismSection1),
-                new SectionSegments(failureMechanismSection2), 
+                new SectionSegments(failureMechanismSection2),
             };
 
             // Call