Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs
===================================================================
diff -u -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs	(.../PipingCalculationConfigurationHelperTest.cs)	(revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs	(.../PipingCalculationConfigurationHelperTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -86,7 +86,7 @@
                 soilProfile1,
                 soilProfile2
             });
-            var availableSoilModels = new[]
+            StochasticSoilModel[] availableSoilModels = 
             {
                 soilModel
             };
@@ -146,7 +146,7 @@
                     SoilProfile = soilProfile2
                 }
             });
-            var availableSoilModels = new[]
+            StochasticSoilModel[] availableSoilModels = 
             {
                 soilModel
             };
@@ -248,7 +248,7 @@
                     SoilProfile = soilProfile2
                 }
             });
-            var availableSoilModels = new[]
+            StochasticSoilModel[] availableSoilModels = 
             {
                 soilModel
             };
@@ -355,7 +355,7 @@
                 new GeneralPipingInput());
 
             // Assert
-            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("surfaceLines", parameter);
         }
 
@@ -369,7 +369,7 @@
                 new GeneralPipingInput());
 
             // Assert
-            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("soilModels", parameter);
         }
 
@@ -383,7 +383,7 @@
                 null);
 
             // Assert
-            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("generalInput", parameter);
         }
 
@@ -428,7 +428,7 @@
 
             // Assert
             var format = "Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.";
-            var expectedMessages = new[]
+            Tuple<string, LogLevelConstant>[] expectedMessages = 
             {
                 Tuple.Create(string.Format(format, testName1), LogLevelConstant.Warn),
                 Tuple.Create(string.Format(format, testName2), LogLevelConstant.Warn),
@@ -486,7 +486,7 @@
                 new Point3D(3.0, -5.0, 0.0)
             });
 
-            var surfaceLines = new[]
+            RingtoetsPipingSurfaceLine[] surfaceLines = 
             {
                 surfaceLine
             };
@@ -548,7 +548,7 @@
                 new Point3D(3.0, -5.0, 0.0)
             });
 
-            var surfaceLines = new[]
+            RingtoetsPipingSurfaceLine[] surfaceLines = 
             {
                 surfaceLine
             };
@@ -564,10 +564,9 @@
             };
 
             // Assert
-            var expectedMessage = Tuple.Create(
-                string.Format(
-                    "Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.",
-                    testName),
+            Tuple<string, LogLevelConstant> expectedMessage = Tuple.Create(
+                string.Format("Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.",
+                              testName),
                 LogLevelConstant.Warn);
             TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage);
             Assert.IsEmpty(result);
@@ -607,7 +606,7 @@
                     SoilProfile = soilProfile2
                 }
             });
-            var availableSoilModels = new[]
+            StochasticSoilModel[] availableSoilModels = 
             {
                 soilModel
             };
@@ -624,7 +623,7 @@
                 new Point3D(5.0, 1.0, 0.0)
             });
 
-            var surfaceLines = new[]
+            RingtoetsPipingSurfaceLine[] surfaceLines = 
             {
                 surfaceLine
             };
@@ -641,10 +640,9 @@
             };
 
             // Assert
-            var expectedMessage = Tuple.Create(
-                string.Format(
-                    "Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.",
-                    testName),
+            Tuple<string, LogLevelConstant> expectedMessage = Tuple.Create(
+                string.Format("Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.",
+                              testName),
                 LogLevelConstant.Warn);
             TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage);
             Assert.IsEmpty(result);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs
===================================================================
diff -u -rce871f8d394d4539208c9ef68372dd9d64ae1941 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs	(.../PipingSurfaceLineSelectionDialogTest.cs)	(revision ce871f8d394d4539208c9ef68372dd9d64ae1941)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs	(.../PipingSurfaceLineSelectionDialogTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -39,9 +39,9 @@
             TestDelegate test = () => new PipingSurfaceLineSelectionDialog(null, Enumerable.Empty<RingtoetsPipingSurfaceLine>());
 
             // Assert
-            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("dialogParent", parameter);
-        } 
+        }
 
         [Test]
         public void Constructor_WithoutSurfaceLines_ThrowsArgumentNullException()
@@ -50,7 +50,7 @@
             TestDelegate test = () => new PipingSurfaceLineSelectionDialog(new Form(), null);
 
             // Assert
-            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("surfaceLines", parameter);
         }
 
@@ -60,7 +60,6 @@
             // Call
             using (var dialog = new PipingSurfaceLineSelectionDialog(new Form(), Enumerable.Empty<RingtoetsPipingSurfaceLine>()))
             {
-
                 // Assert
                 Assert.IsEmpty(dialog.SelectedSurfaceLines);
                 Assert.IsInstanceOf<PipingSurfaceLineSelectionView>(new ControlTester("PipingSurfaceLineSelectionView", dialog).TheObject);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingFailureMechanismContextTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingFailureMechanismContextTest.cs	(.../PipingFailureMechanismContextTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingFailureMechanismContextTest.cs	(.../PipingFailureMechanismContextTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -20,9 +20,7 @@
 // All rights reserved.
 
 using System;
-
 using NUnit.Framework;
-
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.PresentationObjects;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingScenariosContextTest.cs
===================================================================
diff -u -r626c54ec06c0074be690c1a7046081293b0289a8 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingScenariosContextTest.cs	(.../PipingScenariosContextTest.cs)	(revision 626c54ec06c0074be690c1a7046081293b0289a8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingScenariosContextTest.cs	(.../PipingScenariosContextTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -44,6 +44,6 @@
             Assert.IsInstanceOf<WrappedObjectContextBase<CalculationGroup>>(context);
             Assert.AreSame(calculationGroup, context.WrappedData);
             Assert.AreSame(failureMechanism, context.ParentFailureMechanism);
-        } 
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs	(.../PipingFailureMechanismContextPropertiesTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs	(.../PipingFailureMechanismContextPropertiesTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -24,7 +24,6 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui.PropertyBag;
-
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -r0cdb24eee9b746ab5d21381ca51c6836dd460292 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 0cdb24eee9b746ab5d21381ca51c6836dd460292)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -39,7 +39,6 @@
 using Ringtoets.Piping.Forms.TypeConverters;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
-
 using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
@@ -81,7 +80,6 @@
                                               assessmentSectionMock)
             };
 
-
             // Assert
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
@@ -242,11 +240,11 @@
 
             PipingInput inputParameters = new PipingInput(new GeneralPipingInput())
             {
-                HydraulicBoundaryLocation = testHydraulicBoundaryLocation
+                HydraulicBoundaryLocation = testHydraulicBoundaryLocation,
+                SurfaceLine = surfaceLine,
+                StochasticSoilModel = stochasticSoilModel,
+                StochasticSoilProfile = (stochasticSoilProfile)
             };
-            inputParameters.SurfaceLine = surfaceLine;
-            inputParameters.StochasticSoilModel = stochasticSoilModel;
-            inputParameters.StochasticSoilProfile = (stochasticSoilProfile);
 
             PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput());
             PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
@@ -273,13 +271,13 @@
             Assert.AreEqual(inputParameters.ThicknessAquiferLayer.Mean, properties.ThicknessAquiferLayer.Distribution.Mean);
             Assert.AreEqual(inputParameters.ThicknessAquiferLayer.StandardDeviation, properties.ThicknessAquiferLayer.Distribution.StandardDeviation);
             Assert.AreEqual(
-                inputParameters.SaturatedVolumicWeightOfCoverageLayer.Mean, 
+                inputParameters.SaturatedVolumicWeightOfCoverageLayer.Mean,
                 properties.SaturatedVolumicWeightOfCoverageLayer.Distribution.Mean);
             Assert.AreEqual(
-                inputParameters.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation, 
+                inputParameters.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation,
                 properties.SaturatedVolumicWeightOfCoverageLayer.Distribution.StandardDeviation);
             Assert.AreEqual(
-                inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift, 
+                inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift,
                 properties.SaturatedVolumicWeightOfCoverageLayer.Distribution.Shift);
 
             Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevel);
@@ -473,8 +471,10 @@
             PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput());
             PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
 
-            PipingInput inputParameters = new PipingInput(new GeneralPipingInput());
-            inputParameters.SurfaceLine = surfaceLine;
+            PipingInput inputParameters = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
             inputParameters.Attach(inputObserver);
 
             PipingInputContextProperties properties = new PipingInputContextProperties
@@ -512,8 +512,10 @@
             PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput());
             PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
 
-            PipingInput inputParameters = new PipingInput(new GeneralPipingInput());
-            inputParameters.SurfaceLine = surfaceLine;
+            PipingInput inputParameters = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
 
             PipingInputContextProperties properties = new PipingInputContextProperties
             {
@@ -522,11 +524,10 @@
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                               Enumerable.Empty<StochasticSoilModel>(),
                                               failureMechanism,
-                                              assessmentSectionMock)
+                                              assessmentSectionMock),
+                EntryPointL = (RoundedDouble) 2.0
             };
 
-            properties.EntryPointL = (RoundedDouble) 2.0;
-
             inputParameters.Attach(inputObserver);
 
             // Call
@@ -553,8 +554,10 @@
             PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput());
             PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
 
-            PipingInput inputParameters = new PipingInput(new GeneralPipingInput());
-            inputParameters.SurfaceLine = surfaceLine;
+            PipingInput inputParameters = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
 
             PipingInputContextProperties properties = new PipingInputContextProperties
             {
@@ -563,11 +566,10 @@
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                               Enumerable.Empty<StochasticSoilModel>(),
                                               failureMechanism,
-                                              assessmentSectionMock)
+                                              assessmentSectionMock),
+                ExitPointL = (RoundedDouble) 2.0
             };
 
-            properties.ExitPointL = (RoundedDouble) 2.0;
-
             inputParameters.Attach(inputObserver);
 
             // Call
@@ -592,8 +594,10 @@
             PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput());
             PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
 
-            PipingInput inputParameters = new PipingInput(new GeneralPipingInput());
-            inputParameters.SurfaceLine = surfaceLine;
+            PipingInput inputParameters = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
 
             PipingInputContextProperties properties = new PipingInputContextProperties
             {
@@ -602,15 +606,14 @@
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                               Enumerable.Empty<StochasticSoilModel>(),
                                               failureMechanism,
-                                              assessmentSectionMock)
+                                              assessmentSectionMock),
+                ExitPointL = (RoundedDouble) 2.0
             };
 
-            properties.ExitPointL = (RoundedDouble) 2.0;
-
             inputParameters.Attach(inputObserver);
 
             // Call
-            TestDelegate call = () => properties.EntryPointL = (RoundedDouble)(-15.0);
+            TestDelegate call = () => properties.EntryPointL = (RoundedDouble) (-15.0);
 
             // Assert
             const string expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0, 4]).";
@@ -631,8 +634,10 @@
             PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput());
             PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
 
-            PipingInput inputParameters = new PipingInput(new GeneralPipingInput());
-            inputParameters.SurfaceLine = surfaceLine;
+            PipingInput inputParameters = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
 
             var properties = new PipingInputContextProperties
             {
@@ -641,11 +646,10 @@
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                               Enumerable.Empty<StochasticSoilModel>(),
                                               failureMechanism,
-                                              assessmentSectionMock)
+                                              assessmentSectionMock),
+                EntryPointL = (RoundedDouble) 2.0
             };
 
-            properties.EntryPointL = (RoundedDouble) 2.0;
-
             inputParameters.Attach(inputObserver);
 
             // Call
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs	(.../PipingSemiProbabilisticOutputPropertiesTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs	(.../PipingSemiProbabilisticOutputPropertiesTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -85,16 +85,16 @@
             // Call & Assert
             var probabilityFormat = "1/{0:n0}";
             Assert.AreEqual(upliftFactorOfSafety, properties.UpliftFactorOfSafety, properties.UpliftFactorOfSafety.GetAccuracy());
-            Assert.AreEqual(string.Format(probabilityFormat, 1.0 / upliftProbability), properties.UpliftProbability);
+            Assert.AreEqual(string.Format(probabilityFormat, 1.0/upliftProbability), properties.UpliftProbability);
             Assert.AreEqual(heaveFactorOfSafety, properties.HeaveFactorOfSafety, properties.HeaveFactorOfSafety.GetAccuracy());
             Assert.AreEqual(heaveReliability, properties.HeaveReliability, properties.HeaveReliability.GetAccuracy());
-            Assert.AreEqual(string.Format(probabilityFormat, 1.0 / heaveProbability), properties.HeaveProbability);
+            Assert.AreEqual(string.Format(probabilityFormat, 1.0/heaveProbability), properties.HeaveProbability);
             Assert.AreEqual(sellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety.GetAccuracy());
             Assert.AreEqual(sellmeijerReliability, properties.SellmeijerReliability, properties.SellmeijerReliability.GetAccuracy());
-            Assert.AreEqual(string.Format(probabilityFormat, 1.0 / sellmeijerProbability), properties.SellmeijerProbability);
-            Assert.AreEqual(string.Format(probabilityFormat, 1.0 / requiredProbability), properties.RequiredProbability);
+            Assert.AreEqual(string.Format(probabilityFormat, 1.0/sellmeijerProbability), properties.SellmeijerProbability);
+            Assert.AreEqual(string.Format(probabilityFormat, 1.0/requiredProbability), properties.RequiredProbability);
             Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
-            Assert.AreEqual(string.Format(probabilityFormat, 1.0 / pipingProbability), properties.PipingProbability);
+            Assert.AreEqual(string.Format(probabilityFormat, 1.0/pipingProbability), properties.PipingProbability);
             Assert.AreEqual(pipingReliability, properties.PipingReliability, properties.PipingReliability.GetAccuracy());
             Assert.AreEqual(pipingFactorOfSafety, properties.PipingFactorOfSafety, properties.PipingFactorOfSafety.GetAccuracy());
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs	(.../RingtoetsPipingSurfaceLinePropertiesTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs	(.../RingtoetsPipingSurfaceLinePropertiesTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -21,7 +21,6 @@
 
 using Core.Common.Base.Geometry;
 using Core.Common.Gui.PropertyBag;
-
 using NUnit.Framework;
 using Ringtoets.Piping.Forms.PropertyClasses;
 using Ringtoets.Piping.Primitives;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -116,7 +116,7 @@
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-            
+
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocks.StrictMultiMock<IGui>();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4263138ea4c89e88b57b7d76d01c88ae6b750284 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4263138ea4c89e88b57b7d76d01c88ae6b750284)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
@@ -33,12 +32,9 @@
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
-
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
-
 using Rhino.Mocks;
-
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Contribution;
@@ -49,7 +45,6 @@
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Plugin;
 using Ringtoets.Piping.Primitives;
-
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
@@ -147,10 +142,10 @@
             // Assert
             Assert.AreEqual(group.Children.Count, children.Length);
             Assert.AreSame(calculationItem, children[0]);
-            var returnedCalculationContext = (PipingCalculationScenarioContext)children[1];
+            var returnedCalculationContext = (PipingCalculationScenarioContext) children[1];
             Assert.AreSame(childCalculation, returnedCalculationContext.WrappedData);
             Assert.AreSame(pipingFailureMechanism, returnedCalculationContext.FailureMechanism);
-            var returnedCalculationGroupContext = (PipingCalculationGroupContext)children[2];
+            var returnedCalculationGroupContext = (PipingCalculationGroupContext) children[2];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);
             Assert.AreSame(pipingFailureMechanism, returnedCalculationGroupContext.FailureMechanism);
             Assert.AreSame(assessmentSectionMock, returnedCalculationGroupContext.AssessmentSection);
@@ -195,11 +190,11 @@
             var treeViewControl = mocks.StrictMock<TreeViewControl>();
 
             var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
-                importHandlerMock,
-                exportHandlerMock,
-                viewCommandsHandler,
-                nodeData,
-                treeViewControl);
+                                                     importHandlerMock,
+                                                     exportHandlerMock,
+                                                     viewCommandsHandler,
+                                                     nodeData,
+                                                     treeViewControl);
             gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
             treeViewControl.Expect(tvc => tvc.CanRemoveNodeForData(nodeData)).Return(true);
@@ -304,11 +299,11 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
-                    importHandlerMock,
-                    exportHandlerMock,
-                    viewCommandsHandler,
-                    nodeData,
-                    treeViewControl);
+                                                         importHandlerMock,
+                                                         exportHandlerMock,
+                                                         viewCommandsHandler,
+                                                         nodeData,
+                                                         treeViewControl);
                 gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
                 viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(true);
 
@@ -1005,8 +1000,8 @@
                 int rowCount = 0;
                 DialogBoxHandler = (name, wnd) =>
                 {
-                    selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
-                    grid = (DataGridView)new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
+                    selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
+                    grid = (DataGridView) new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
                     rowCount = grid.RowCount;
                     new ButtonTester("CustomCancelButton", selectionDialog).Click();
                 };
@@ -1150,8 +1145,8 @@
 
                 DialogBoxHandler = (name, wnd) =>
                 {
-                    var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
-                    var grid = (DataGridView)new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
+                    var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
+                    var grid = (DataGridView) new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
 
                     grid.Rows[0].Cells[0].Value = true;
 
@@ -1267,8 +1262,8 @@
 
                 DialogBoxHandler = (name, wnd) =>
                 {
-                    var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
-                    var grid = (DataGridView)new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
+                    var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
+                    var grid = (DataGridView) new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
 
                     grid.Rows[0].Cells[0].Value = true;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision bd4baf94660bac291a78ee43b16afb20efc3e3c6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
@@ -31,12 +30,9 @@
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
-
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
-
 using Rhino.Mocks;
-
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
@@ -49,7 +45,6 @@
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Plugin;
 using Ringtoets.Piping.Primitives;
-
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -142,7 +137,7 @@
             Assert.IsNotNull(commentContext);
             Assert.AreSame(pipingCalculationContext.WrappedData, commentContext.WrappedData);
 
-            var pipingInputContext = (PipingInputContext)children[1];
+            var pipingInputContext = (PipingInputContext) children[1];
             Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData);
             CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines);
             CollectionAssert.AreEqual(pipingCalculationContext.AvailableStochasticSoilModels, pipingInputContext.AvailableStochasticSoilModels);
@@ -175,7 +170,7 @@
             Assert.IsNotNull(commentContext);
             Assert.AreSame(pipingCalculationContext.WrappedData, commentContext.WrappedData);
 
-            var pipingInputContext = (PipingInputContext)children[1];
+            var pipingInputContext = (PipingInputContext) children[1];
             Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData);
             CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines);
             CollectionAssert.AreEqual(pipingCalculationContext.AvailableStochasticSoilModels, pipingInputContext.AvailableStochasticSoilModels);
@@ -502,7 +497,7 @@
                 Action action = () => contextMenuAdapter.Items[validateContextMenuItemIndex].PerformClick();
 
                 // Then
-                var expectedValidationMessageCount = 5; 
+                var expectedValidationMessageCount = 5;
                 var expectedStatusMessageCount = 2;
                 var expectedLogMessageCount = expectedValidationMessageCount + expectedStatusMessageCount;
                 TestHelper.AssertLogMessagesCount(action, expectedLogMessageCount);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -21,20 +21,15 @@
 
 using System.Collections.Generic;
 using System.Linq;
-
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
-
 using NUnit.Framework;
-
 using Rhino.Mocks;
-
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Plugin;
 using Ringtoets.Piping.Primitives;
-
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.TreeNodeInfos
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs	(.../LogNormalDistributionDesignVariableTypeConverterTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs	(.../LogNormalDistributionDesignVariableTypeConverterTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -21,13 +21,10 @@
 
 using System.ComponentModel;
 using System.Linq;
-
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui.PropertyBag;
-
 using NUnit.Framework;
-
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Probabilistics;
@@ -71,8 +68,8 @@
             // Setup
             var distribution = new LogNormalDistribution(1)
             {
-                Mean = (RoundedDouble)1.1,
-                StandardDeviation = (RoundedDouble)2.2
+                Mean = (RoundedDouble) 1.1,
+                StandardDeviation = (RoundedDouble) 2.2
             };
             var designVariable = new LogNormalDistributionDesignVariable(distribution);
 
@@ -250,8 +247,8 @@
 
             // Event
             const double newDoubleValue = 2.3;
-            properties[propertyIndexToChange].SetValue(dampingFactorExit, (RoundedDouble)newDoubleValue);
-            
+            properties[propertyIndexToChange].SetValue(dampingFactorExit, (RoundedDouble) newDoubleValue);
+
             // Result
             switch (propertyIndexToChange)
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/PropertyDescriptors/RoutedPropertyDescriptorTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/PropertyDescriptors/RoutedPropertyDescriptorTest.cs	(.../RoutedPropertyDescriptorTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/PropertyDescriptors/RoutedPropertyDescriptorTest.cs	(.../RoutedPropertyDescriptorTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -20,9 +20,7 @@
 // All rights reserved.
 
 using System.ComponentModel;
-
 using NUnit.Framework;
-
 using Ringtoets.Piping.Forms.TypeConverters.PropertyDescriptors;
 
 namespace Ringtoets.Piping.Forms.Test.TypeConverters.PropertyDescriptors
@@ -38,7 +36,7 @@
             var propertyDescription = TypeDescriptor.GetProperties(a.Child)[0];
 
             // Call
-            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA)o).Child);
+            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA) o).Child);
 
             // Assert
             Assert.AreEqual(propertyDescription.ComponentType, routedPropertyDescriptor.ComponentType);
@@ -65,7 +63,7 @@
             var a = new TestA();
             var propertyDescription = TypeDescriptor.GetProperties(a.Child)[0];
 
-            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA)o).Child);
+            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA) o).Child);
 
             // Call
             var result = routedPropertyDescriptor.CanResetValue(a);
@@ -81,7 +79,7 @@
             var a = new TestA();
             var propertyDescription = TypeDescriptor.GetProperties(a.Child)[0];
 
-            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA)o).Child);
+            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA) o).Child);
 
             // Call
             var result = routedPropertyDescriptor.GetValue(a);
@@ -108,7 +106,7 @@
             getSetProperty.ResetValue(a.Child);
             var expectedPropertyValueAfterReset = a.Child.Value;
 
-            var routedPropertyDescriptor = new RoutedPropertyDescriptor(getSetProperty, o => ((TestA)o).Child);
+            var routedPropertyDescriptor = new RoutedPropertyDescriptor(getSetProperty, o => ((TestA) o).Child);
             a.Child.Value = originalPropertyValue;
 
             // Call
@@ -137,7 +135,7 @@
             getSetProperty.SetValue(a.Child, newValue);
             var expectedPropertyValueAfterReset = a.Child.Value;
 
-            var routedPropertyDescriptor = new RoutedPropertyDescriptor(getSetProperty, o => ((TestA)o).Child);
+            var routedPropertyDescriptor = new RoutedPropertyDescriptor(getSetProperty, o => ((TestA) o).Child);
             a.Child.Value = originalPropertyValue;
 
             // Call
@@ -154,7 +152,7 @@
             var a = new TestA();
             var propertyDescription = TypeDescriptor.GetProperties(a.Child)[0];
 
-            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA)o).Child);
+            var routedPropertyDescriptor = new RoutedPropertyDescriptor(propertyDescription, o => ((TestA) o).Child);
 
             // Call
             var result = routedPropertyDescriptor.ShouldSerializeValue(a);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -26,14 +26,11 @@
 using Core.Common.Controls.DataGrid;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-
 using Rhino.Mocks;
-
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.Views;
-
 using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
@@ -186,7 +183,7 @@
             })
             {
                 // Call
-                row.DampingFactorExitMean = (RoundedDouble)newValue;
+                row.DampingFactorExitMean = (RoundedDouble) newValue;
 
                 // Assert
                 Assert.AreEqual(1, counter);
@@ -210,7 +207,7 @@
             })
             {
                 // Call
-                row.PhreaticLevelExitMean = (RoundedDouble)newValue;
+                row.PhreaticLevelExitMean = (RoundedDouble) newValue;
 
                 // Assert
                 Assert.AreEqual(1, counter);
@@ -235,7 +232,7 @@
             calculation.InputParameters.Attach(observer);
 
             // Call
-            row.EntryPointL = (RoundedDouble)newValue;
+            row.EntryPointL = (RoundedDouble) newValue;
 
             // Assert
             Assert.AreEqual(new RoundedDouble(2, newValue), calculation.InputParameters.EntryPointL);
@@ -273,17 +270,17 @@
             var mocks = new MockRepository();
             var observer = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
-  
+
             var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
             var row = new PipingCalculationRow(calculation);
-  
+
             calculation.InputParameters.Attach(observer);
-  
+
             var newValue = -3.0;
-  
+
             // Call
             TestDelegate call = () => row.EntryPointL = (RoundedDouble) newValue;
-  
+
             // Assert
             const string expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0, 1]).";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, expectedMessage);
@@ -307,7 +304,7 @@
             calculation.InputParameters.Attach(observer);
 
             // Call
-            row.ExitPointL = (RoundedDouble)newValue;
+            row.ExitPointL = (RoundedDouble) newValue;
 
             // Assert
             Assert.AreEqual(new RoundedDouble(2, newValue), calculation.InputParameters.ExitPointL);
@@ -330,7 +327,7 @@
             calculation.InputParameters.Attach(observer);
 
             // Call
-            TestDelegate call = () => row.ExitPointL = (RoundedDouble)newValue;
+            TestDelegate call = () => row.ExitPointL = (RoundedDouble) newValue;
 
             // Assert
             var expectedMessage = RingtoetsPipingDataResources.PipingInput_EntryPointL_greater_or_equal_to_ExitPointL;
@@ -354,7 +351,7 @@
             var newValue = 3.0;
 
             // Call
-            TestDelegate call = () => row.ExitPointL = (RoundedDouble)newValue;
+            TestDelegate call = () => row.ExitPointL = (RoundedDouble) newValue;
 
             // Assert
             const string expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0, 1]).";
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -40,7 +40,6 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
-
 using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
@@ -537,7 +536,7 @@
             var pipingScenarioView = ShowPipingCalculationsView();
             pipingScenarioView.PipingFailureMechanism = pipingFailureMechanismWithSections;
 
-            var listBox = (ListBox)new ControlTester("listBox").TheObject;
+            var listBox = (ListBox) new ControlTester("listBox").TheObject;
 
             // Precondition
             Assert.AreEqual(0, listBox.Items.Count);
@@ -581,8 +580,8 @@
             DataGridView grid = null;
             DialogBoxHandler = (name, wnd) =>
             {
-                selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
-                grid = (DataGridView)new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
+                selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
+                grid = (DataGridView) new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
 
                 new ButtonTester("CustomCancelButton", selectionDialog).Click();
             };
@@ -659,7 +658,7 @@
 
             DialogBoxHandler = (name, wnd) =>
             {
-                var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
+                var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
 
                 // When
                 new ButtonTester(buttonName, selectionDialog).Click();
@@ -687,7 +686,7 @@
 
             DialogBoxHandler = (name, wnd) =>
             {
-                var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
+                var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
 
                 var selectionView = (DataGridView) new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
 
@@ -728,7 +727,7 @@
 
             DialogBoxHandler = (name, wnd) =>
             {
-                var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
+                var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject;
 
                 var selectionView = (DataGridView) new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
 
@@ -841,49 +840,6 @@
             Assert.IsFalse(button.Enabled);
         }
 
-        [TestCase(nameColumnIndex, "New name", true, false)]
-        [TestCase(stochasticSoilProfilesColumnIndex, null, false, true)]
-        [TestCase(hydraulicBoundaryLocationsColumnIndex, null, false, true)]
-        [TestCase(dampingFactorExitMeanColumnIndex, 1.1, false, true)]
-        [TestCase(phreaticLevelExitMeanColumnIndex, 1.1, false, true)]
-        [TestCase(entryPointLColumnIndex, 1.1, false, true)]
-        [TestCase(exitPointLColumnIndex, 5.5, false, true)]
-        public void PipingCalculationsView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified(int cellIndex, object newValue, bool expectPipingCalculationNotify, bool expectPipingCalculationInputNotify)
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var pipingCalculationObserver = mocks.StrictMock<IObserver>();
-            var pipingCalculationInputObserver = mocks.StrictMock<IObserver>();
-
-            if (expectPipingCalculationNotify)
-            {
-                pipingCalculationObserver.Expect(o => o.UpdateObserver());
-            }
-
-            if (expectPipingCalculationInputNotify)
-            {
-                pipingCalculationInputObserver.Expect(o => o.UpdateObserver());
-            }
-
-            mocks.ReplayAll();
-
-            var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
-
-            var data = (CalculationGroup) pipingCalculationView.Data;
-            var pipingCalculation = (PipingCalculationScenario) data.Children.First();
-
-            pipingCalculation.Attach(pipingCalculationObserver);
-            pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver);
-
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-
-            // Call
-            dataGridView.Rows[0].Cells[cellIndex].Value = newValue is double ? (RoundedDouble) (double) newValue : newValue;
-
-            // Assert
-            mocks.VerifyAll();
-        }
-
         [Test]
         [TestCase(entryPointLColumnIndex, 6.6)]
         [TestCase(entryPointLColumnIndex, 4.44)]
@@ -899,13 +855,13 @@
 
             var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
 
-            var data = (CalculationGroup)pipingCalculationView.Data;
-            var pipingCalculation = (PipingCalculationScenario)data.Children.First();
+            var data = (CalculationGroup) pipingCalculationView.Data;
+            var pipingCalculation = (PipingCalculationScenario) data.Children.First();
 
             pipingCalculation.Attach(pipingCalculationObserver);
             pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver);
 
-            var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
             // Call
             dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble) newValue;
@@ -930,16 +886,16 @@
 
             var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
 
-            var data = (CalculationGroup)pipingCalculationView.Data;
-            var pipingCalculation = (PipingCalculationScenario)data.Children.First();
+            var data = (CalculationGroup) pipingCalculationView.Data;
+            var pipingCalculation = (PipingCalculationScenario) data.Children.First();
 
             pipingCalculation.Attach(pipingCalculationObserver);
             pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver);
 
-            var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
             // Call
-            dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble)newValue;
+            dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble) newValue;
 
             // Assert
             var expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0, 10]).";
@@ -955,7 +911,7 @@
             // Setup
             var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
 
-            var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
             dataGridView.CurrentCell = dataGridView.Rows[selectedRow].Cells[0];
 
@@ -964,10 +920,53 @@
 
             // Assert
             Assert.IsInstanceOf<PipingInputContext>(selection);
-            var dataRow = (PipingCalculationRow)dataGridView.Rows[selectedRow].DataBoundItem;
-            Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext)selection).PipingCalculation);
+            var dataRow = (PipingCalculationRow) dataGridView.Rows[selectedRow].DataBoundItem;
+            Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext) selection).PipingCalculation);
         }
 
+        [TestCase(nameColumnIndex, "New name", true, false)]
+        [TestCase(stochasticSoilProfilesColumnIndex, null, false, true)]
+        [TestCase(hydraulicBoundaryLocationsColumnIndex, null, false, true)]
+        [TestCase(dampingFactorExitMeanColumnIndex, 1.1, false, true)]
+        [TestCase(phreaticLevelExitMeanColumnIndex, 1.1, false, true)]
+        [TestCase(entryPointLColumnIndex, 1.1, false, true)]
+        [TestCase(exitPointLColumnIndex, 5.5, false, true)]
+        public void PipingCalculationsView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified(int cellIndex, object newValue, bool expectPipingCalculationNotify, bool expectPipingCalculationInputNotify)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var pipingCalculationObserver = mocks.StrictMock<IObserver>();
+            var pipingCalculationInputObserver = mocks.StrictMock<IObserver>();
+
+            if (expectPipingCalculationNotify)
+            {
+                pipingCalculationObserver.Expect(o => o.UpdateObserver());
+            }
+
+            if (expectPipingCalculationInputNotify)
+            {
+                pipingCalculationInputObserver.Expect(o => o.UpdateObserver());
+            }
+
+            mocks.ReplayAll();
+
+            var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
+
+            var data = (CalculationGroup) pipingCalculationView.Data;
+            var pipingCalculation = (PipingCalculationScenario) data.Children.First();
+
+            pipingCalculation.Attach(pipingCalculationObserver);
+            pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver);
+
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+            // Call
+            dataGridView.Rows[0].Cells[cellIndex].Value = newValue is double ? (RoundedDouble) (double) newValue : newValue;
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
         private const int nameColumnIndex = 0;
         private const int stochasticSoilModelsColumnIndex = 1;
         private const int stochasticSoilProfilesColumnIndex = 2;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs
===================================================================
diff -u -r166f0d43e8e9d8820a7b95503ed2196d0fc54741 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 166f0d43e8e9d8820a7b95503ed2196d0fc54741)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -168,27 +168,6 @@
             Assert.AreEqual("soilProfile", paramName);
         }
 
-        [TestCase(-1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        public void CreateSoilLayerChartData_InvalidSoilLayerIndex_ThrowsArgumentOutOfRangeException(int soilLayerIndex)
-        {
-            // Setup
-            var layers = new[]
-            {
-                new PipingSoilLayer(0),
-                new PipingSoilLayer(1)
-            };
-            var profile = new PipingSoilProfile("name", -1.0, layers, SoilProfileType.SoilProfile1D, 0);
-
-            // Call
-            TestDelegate test = () => PipingChartDataFactory.CreateSoilLayerChartData(soilLayerIndex, profile);
-
-            // Assert
-            var paramName = Assert.Throws<ArgumentOutOfRangeException>(test).ParamName;
-            Assert.AreEqual("soilLayerIndex", paramName);
-        }
-
         [Test]
         [TestCase("A", 0)]
         [TestCase("B", 3)]
@@ -301,6 +280,27 @@
             Assert.AreEqual("soil profile name", chartData.Name);
         }
 
+        [TestCase(-1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        public void CreateSoilLayerChartData_InvalidSoilLayerIndex_ThrowsArgumentOutOfRangeException(int soilLayerIndex)
+        {
+            // Setup
+            var layers = new[]
+            {
+                new PipingSoilLayer(0),
+                new PipingSoilLayer(1)
+            };
+            var profile = new PipingSoilProfile("name", -1.0, layers, SoilProfileType.SoilProfile1D, 0);
+
+            // Call
+            TestDelegate test = () => PipingChartDataFactory.CreateSoilLayerChartData(soilLayerIndex, profile);
+
+            // Assert
+            var paramName = Assert.Throws<ArgumentOutOfRangeException>(test).ParamName;
+            Assert.AreEqual("soilLayerIndex", paramName);
+        }
+
         private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, DashStyle style)
         {
             Assert.AreEqual(color, lineStyle.Color);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataPointsFactoryTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataPointsFactoryTest.cs	(.../PipingChartDataPointsFactoryTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataPointsFactoryTest.cs	(.../PipingChartDataPointsFactoryTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -154,7 +154,7 @@
             var pipingInput = new PipingInput(new GeneralPipingInput())
             {
                 SurfaceLine = GetSurfaceLineWithGeometry(),
-                ExitPointL = (RoundedDouble)double.NaN
+                ExitPointL = (RoundedDouble) double.NaN
             };
 
             // Call
@@ -736,4 +736,4 @@
             return surfaceLine;
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -303,9 +303,8 @@
             {
                 var calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(
                     1.0/1000.0,
-                    pipingFailureMechanism.Sections.First()
-                );
-                calculationScenario.Contribution = (RoundedDouble)0.3;
+                    pipingFailureMechanism.Sections.First());
+                calculationScenario.Contribution = (RoundedDouble) 0.3;
                 pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
                 view.Data = pipingFailureMechanism.SectionResults;
 
@@ -334,8 +333,7 @@
             {
                 var calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(
                     (RoundedDouble) 1e-3,
-                    pipingFailureMechanism.Sections.First()
-                );
+                    pipingFailureMechanism.Sections.First());
                 pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
                 view.Data = pipingFailureMechanism.SectionResults;
 
@@ -363,8 +361,7 @@
             using (ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism))
             {
                 var calculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(
-                    pipingFailureMechanism.Sections.First()
-                );
+                    pipingFailureMechanism.Sections.First());
                 pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario);
 
                 var gridTester = new ControlTester("dataGridView");
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r9d7a5bd6246ec71a14f1944516d21e06954243f7 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision 9d7a5bd6246ec71a14f1944516d21e06954243f7)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -25,7 +25,6 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Utils.Reflection;
-
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
@@ -35,7 +34,6 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.Views;
-
 using CommonBaseResources = Core.Common.Base.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
@@ -99,7 +97,7 @@
 
             // Assert
             Assert.AreEqual(newValue, result.AssessmentLayerOne);
-            
+
             mocks.VerifyAll();
         }
 
@@ -118,23 +116,27 @@
         }
 
         [Test]
-        [TestCase(0.2,0.8-1e5)]
-        [TestCase(0.0,0.5)]
-        [TestCase(0.3,0.7+1e-5)]
-        [TestCase(-5,-8)]
-        [TestCase(13,2)]
+        [TestCase(0.2, 0.8 - 1e5)]
+        [TestCase(0.0, 0.5)]
+        [TestCase(0.3, 0.7 + 1e-5)]
+        [TestCase(-5, -8)]
+        [TestCase(13, 2)]
         public void AssessmentLayerTwoA_RelevantScenarioContributionDontAddUpTo1_ReturnNaN(double contributionA, double contributionB)
         {
             // Setup
             var section = CreateSection();
 
             var scenarioA = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section);
             var scenarioB = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section);
-            scenarioA.Contribution = (RoundedDouble)contributionA;
-            scenarioB.Contribution = (RoundedDouble)contributionB;
+            scenarioA.Contribution = (RoundedDouble) contributionA;
+            scenarioB.Contribution = (RoundedDouble) contributionB;
 
             var result = new PipingFailureMechanismSectionResult(section);
-            var row = new PipingFailureMechanismSectionResultRow(result, new[] { scenarioA , scenarioB });
+            var row = new PipingFailureMechanismSectionResultRow(result, new[]
+            {
+                scenarioA,
+                scenarioB
+            });
 
             // Call
             var assessmentLayerTwoA = row.AssessmentLayerTwoA;
@@ -156,7 +158,10 @@
                                : PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
 
             var result = new PipingFailureMechanismSectionResult(section);
-            var row = new PipingFailureMechanismSectionResultRow(result, new [] { scenario });
+            var row = new PipingFailureMechanismSectionResultRow(result, new[]
+            {
+                scenario
+            });
 
             // Call
             var assessmentLayerTwoA = row.AssessmentLayerTwoA;
@@ -171,16 +176,22 @@
             // Setup            
             var section = CreateSection();
             var scenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.2, section);
-            scenario.Contribution = (RoundedDouble)1.0;
+            scenario.Contribution = (RoundedDouble) 1.0;
 
             var result = new PipingFailureMechanismSectionResult(section);
-            var row = new PipingFailureMechanismSectionResultRow(result, new[] { scenario });
-            
+            var row = new PipingFailureMechanismSectionResultRow(result, new[]
+            {
+                scenario
+            });
+
             // Call
             var assessmentLayerTwoA = row.AssessmentLayerTwoA;
 
             // Assert
-            var expected = result.GetAssessmentLayerTwoA(new[] { scenario });
+            var expected = result.GetAssessmentLayerTwoA(new[]
+            {
+                scenario
+            });
             Assert.AreEqual(expected, assessmentLayerTwoA, 1e-6);
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs
===================================================================
diff -u -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -28,7 +28,6 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.Views;
-
 using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
@@ -75,7 +74,7 @@
             Assert.AreSame(calculation, row.PipingCalculation);
             Assert.AreEqual(calculation.Name, row.Name);
             Assert.AreEqual(calculation.IsRelevant, row.IsRelevant);
-            Assert.AreEqual(calculation.Contribution * 100, row.Contribution);
+            Assert.AreEqual(calculation.Contribution*100, row.Contribution);
             Assert.AreEqual(ProbabilityFormattingHelper.Format(calculation.SemiProbabilisticOutput.PipingProbability), row.FailureProbabilityPiping);
             Assert.AreEqual(ProbabilityFormattingHelper.Format(calculation.SemiProbabilisticOutput.UpliftProbability), row.FailureProbabilityUplift);
             Assert.AreEqual(ProbabilityFormattingHelper.Format(calculation.SemiProbabilisticOutput.HeaveProbability), row.FailureProbabilityHeave);
@@ -95,7 +94,7 @@
             Assert.AreSame(calculation, row.PipingCalculation);
             Assert.AreEqual(calculation.Name, row.Name);
             Assert.AreEqual(calculation.IsRelevant, row.IsRelevant);
-            Assert.AreEqual(calculation.Contribution * 100, row.Contribution);
+            Assert.AreEqual(calculation.Contribution*100, row.Contribution);
             Assert.AreEqual("-", row.FailureProbabilityPiping);
             Assert.AreEqual("-", row.FailureProbabilityUplift);
             Assert.AreEqual("-", row.FailureProbabilityHeave);
@@ -147,7 +146,7 @@
 
                 // Assert
                 Assert.AreEqual(1, counter);
-                Assert.AreEqual(new RoundedDouble(2, newValue), calculation.Contribution * 100);
+                Assert.AreEqual(new RoundedDouble(2, newValue), calculation.Contribution*100);
             }
         }
     }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -36,7 +36,6 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
-
 using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
@@ -182,7 +181,7 @@
             var pipingScenarioView = ShowPipingScenarioView();
             pipingScenarioView.PipingFailureMechanism = pipingFailureMechanismWithSections;
 
-            var listBox = (ListBox)new ControlTester("listBox").TheObject;
+            var listBox = (ListBox) new ControlTester("listBox").TheObject;
 
             // Precondition
             Assert.AreEqual(0, listBox.Items.Count);
@@ -263,7 +262,7 @@
 
             // Call
             dataGridView.Rows[0].Cells[contributionColumnIndex].Value = (RoundedDouble) newValue;
-            
+
             // Assert
             Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
         }
@@ -296,6 +295,7 @@
             // Assert
             mocks.VerifyAll();
         }
+
         private const int isRelevantColumnIndex = 0;
         private const int contributionColumnIndex = 1;
         private const int nameColumnIndex = 2;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs	(.../PipingSurfaceLineSelectionViewTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs	(.../PipingSurfaceLineSelectionViewTest.cs)	(revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
@@ -34,8 +34,6 @@
     public class PipingSurfaceLineSelectionViewTest
     {
         private Form testForm;
-        private const int surfaceLineNameColumnIndex = 1;
-        private const int selectedColumnIndex = 0;
 
         [SetUp]
         public void Setup()
@@ -69,7 +67,7 @@
             // Assert
             ShowPipingCalculationsView(view);
 
-            var surfaceLineDataGrid = (DataGridView)new ControlTester("SurfaceLineDataGrid").TheObject;
+            var surfaceLineDataGrid = (DataGridView) new ControlTester("SurfaceLineDataGrid").TheObject;
 
             Assert.AreEqual(2, surfaceLineDataGrid.ColumnCount);
             Assert.IsFalse(surfaceLineDataGrid.RowHeadersVisible);
@@ -97,20 +95,20 @@
             var testname = "testName";
             var ringtoetsPipingSurfaceLine = new RingtoetsPipingSurfaceLine();
             ringtoetsPipingSurfaceLine.Name = testname;
-            
+
             // Call
-            var view = new PipingSurfaceLineSelectionView(new []
+            var view = new PipingSurfaceLineSelectionView(new[]
             {
                 ringtoetsPipingSurfaceLine
             });
 
             // Assert
             ShowPipingCalculationsView(view);
-            var surfaceLineDataGrid = (DataGridView)new ControlTester("SurfaceLineDataGrid").TheObject;
+            var surfaceLineDataGrid = (DataGridView) new ControlTester("SurfaceLineDataGrid").TheObject;
 
             Assert.AreEqual(1, surfaceLineDataGrid.RowCount);
-            Assert.IsFalse((bool)surfaceLineDataGrid.Rows[0].Cells[selectedColumnIndex].Value);
-            Assert.AreEqual(testname, (string)surfaceLineDataGrid.Rows[0].Cells[surfaceLineNameColumnIndex].Value);
+            Assert.IsFalse((bool) surfaceLineDataGrid.Rows[0].Cells[selectedColumnIndex].Value);
+            Assert.AreEqual(testname, (string) surfaceLineDataGrid.Rows[0].Cells[surfaceLineNameColumnIndex].Value);
         }
 
         [Test]
@@ -133,7 +131,7 @@
             selectAllButtonTester.Click();
 
             // Assert
-            var surfaceLineDataGrid = (DataGridView)new ControlTester("SurfaceLineDataGrid").TheObject;
+            var surfaceLineDataGrid = (DataGridView) new ControlTester("SurfaceLineDataGrid").TheObject;
             for (int i = 0; i < surfaceLineDataGrid.RowCount; i++)
             {
                 var row = surfaceLineDataGrid.Rows[i];
@@ -157,7 +155,7 @@
             ShowPipingCalculationsView(view);
             var selectNoneButtonTester = new ButtonTester("SelectNoneButton");
 
-            var surfaceLineDataGrid = (DataGridView)new ControlTester("SurfaceLineDataGrid").TheObject;
+            var surfaceLineDataGrid = (DataGridView) new ControlTester("SurfaceLineDataGrid").TheObject;
             for (int i = 0; i < surfaceLineDataGrid.RowCount; i++)
             {
                 var row = surfaceLineDataGrid.Rows[i];
@@ -194,15 +192,19 @@
 
             ShowPipingCalculationsView(view);
 
-            var surfaceLineDataGrid = (DataGridView)new ControlTester("SurfaceLineDataGrid").TheObject;
+            var surfaceLineDataGrid = (DataGridView) new ControlTester("SurfaceLineDataGrid").TheObject;
             surfaceLineDataGrid.Rows[1].Cells[selectedColumnIndex].Value = true;
             surfaceLineDataGrid.Rows[3].Cells[selectedColumnIndex].Value = true;
 
             // Call
             IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines = view.GetSelectedSurfaceLines();
 
             // Assert
-            CollectionAssert.AreEqual(new[] { ringtoetsPipingSurfaceLine2, ringtoetsPipingSurfaceLine4 }, surfaceLines);
+            CollectionAssert.AreEqual(new[]
+            {
+                ringtoetsPipingSurfaceLine2,
+                ringtoetsPipingSurfaceLine4
+            }, surfaceLines);
         }
 
         [Test]
@@ -251,7 +253,7 @@
 
             ShowPipingCalculationsView(view);
 
-            var surfaceLineDataGrid = (DataGridView)new ControlTester("SurfaceLineDataGrid").TheObject;
+            var surfaceLineDataGrid = (DataGridView) new ControlTester("SurfaceLineDataGrid").TheObject;
             surfaceLineDataGrid.Rows[0].Cells[selectedColumnIndex].Value = true;
             surfaceLineDataGrid.Rows[1].Cells[selectedColumnIndex].Value = true;
             surfaceLineDataGrid.Rows[2].Cells[selectedColumnIndex].Value = true;
@@ -279,6 +281,9 @@
             Assert.IsEmpty(surfaceLines);
         }
 
+        private const int surfaceLineNameColumnIndex = 1;
+        private const int selectedColumnIndex = 0;
+
         private void ShowPipingCalculationsView(PipingSurfaceLineSelectionView pipingCalculationsView)
         {
             testForm.Controls.Add(pipingCalculationsView);