Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs
===================================================================
diff -u -rd0c8b732562aedfa164e33707e52098dbddb3765 -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs	(.../ClosingStructuresScenarioRow.cs)	(revision d0c8b732562aedfa164e33707e52098dbddb3765)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs	(.../ClosingStructuresScenarioRow.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -29,7 +29,7 @@
 namespace Riskeer.ClosingStructures.Forms.Views
 {
     /// <summary>
-    /// Representation of a <see cref="StructuresCalculationScenario{ClosingStructuresInput}"/>
+    /// Representation of a <see cref="StructuresCalculationScenario{T}"/>
     /// which takes care of the representation of properties in a grid.
     /// </summary>
     public class ClosingStructuresScenarioRow : ScenarioRow<StructuresCalculationScenario<ClosingStructuresInput>>
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationWriter.cs
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationWriter.cs	(.../ClosingStructuresCalculationConfigurationWriter.cs)	(revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationWriter.cs	(.../ClosingStructuresCalculationConfigurationWriter.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -90,6 +90,11 @@
                                            configuration.LevelCrestStructureNotClosing);
         }
 
+        protected override int GetConfigurationVersion()
+        {
+            return 1;
+        }
+
         /// <summary>
         /// Writes the <paramref name="inflowModelType"/> in XML format to file.
         /// </summary>
@@ -109,10 +114,5 @@
                     new ConfigurationClosingStructureInflowModelTypeConverter().ConvertToInvariantString(inflowModelType));
             }
         }
-
-        protected override int GetConfigurationVersion()
-        {
-            return 1;
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -r3bdfb946be8e8504864bea1cf69d3b37f94bde8c -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 3bdfb946be8e8504864bea1cf69d3b37f94bde8c)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -232,12 +232,12 @@
 
         [Test]
         [TestCaseSource(typeof(ClosingStructurePermutationHelper),
-            nameof(ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameIdNameAndLocation),
-            new object[]
-            {
-                "IsStructureInputSynchronized",
-                "ReturnFalse"
-            })]
+                        nameof(ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameIdNameAndLocation),
+                        new object[]
+                        {
+                            "IsStructureInputSynchronized",
+                            "ReturnFalse"
+                        })]
         public void IsStructureInputSynchronized_StructureAndInputNotInSync_ReturnFalse(ClosingStructure modifiedStructure)
         {
             // Setup
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/ClosingStructuresCalculationScenarioTestFactory.cs
===================================================================
diff -u -r7ca9e70221e813bd346b89788b8ea9ab4c7c5c35 -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/ClosingStructuresCalculationScenarioTestFactory.cs	(.../ClosingStructuresCalculationScenarioTestFactory.cs)	(revision 7ca9e70221e813bd346b89788b8ea9ab4c7c5c35)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/ClosingStructuresCalculationScenarioTestFactory.cs	(.../ClosingStructuresCalculationScenarioTestFactory.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -74,4 +74,4 @@
             return scenario;
         }
     }
-}
+}
\ No newline at end of file
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r0abe33b80713ee0e6699a564501fb80af5b0ab7b -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision 0abe33b80713ee0e6699a564501fb80af5b0ab7b)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs	(.../ClosingStructuresInputContextPropertiesTest.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -794,7 +794,7 @@
             SetPropertyAndVerifyNotificationsAndOutput(
                 properties => properties.DrainCoefficient.Mean = newMean);
         }
-        
+
         [Test]
         public void DrainCoefficient_StandardDeviationChanged_InputChangedAndObservablesNotified()
         {
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsRowTest.cs
===================================================================
diff -u -rb603acd52e092d8cd6863129ae56bb0568a72dd1 -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsRowTest.cs	(.../ClosingStructuresCalculationsRowTest.cs)	(revision b603acd52e092d8cd6863129ae56bb0568a72dd1)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsRowTest.cs	(.../ClosingStructuresCalculationsRowTest.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -345,7 +345,7 @@
             // Setup
             var inflowModelTypeChangedCounter = 0;
             var random = new Random(21);
-            
+
             var mocks = new MockRepository();
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -rb03ea543c850cf2fcdbcf53bd89d11dba2f48020 -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs	(.../ClosingStructuresFailureMechanismSectionResultRowTest.cs)	(revision b03ea543c850cf2fcdbcf53bd89d11dba2f48020)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs	(.../ClosingStructuresFailureMechanismSectionResultRowTest.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -1309,13 +1309,13 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var resultRow = new ClosingStructuresFailureMechanismSectionResultRow(
-                    sectionResult, 
+                    sectionResult,
                     new[]
                     {
                         calculation
                     },
-                    failureMechanism, 
-                    assessmentSection, 
+                    failureMechanism,
+                    assessmentSection,
                     ConstructionProperties);
 
                 // Call
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs
===================================================================
diff -u -r3b987d7e53ec6e53ce6b3200b7db1719114e2d4d -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs	(.../ClosingStructuresScenariosViewTest.cs)	(revision 3b987d7e53ec6e53ce6b3200b7db1719114e2d4d)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs	(.../ClosingStructuresScenariosViewTest.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -100,7 +100,7 @@
             ShowClosingStructuresScenariosView(new ClosingStructuresFailureMechanism());
 
             // Assert
-            var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
             Assert.AreEqual(4, dataGridView.ColumnCount);
             Assert.AreEqual("In oordeel", dataGridView.Columns[isRelevantColumnIndex].HeaderText);
             Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", dataGridView.Columns[contributionColumnIndex].HeaderText);
@@ -114,7 +114,7 @@
             // Call
             ShowFullyConfiguredClosingStructuresScenariosView();
 
-            var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
             // Assert
             DataGridViewRowCollection rows = dataGridView.Rows;
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs
===================================================================
diff -u -rb03ea543c850cf2fcdbcf53bd89d11dba2f48020 -r315ed3dc4af692b550a99bde20ea73d256b6efa9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs	(.../ClosingStructureUpdateDataStrategyTest.cs)	(revision b03ea543c850cf2fcdbcf53bd89d11dba2f48020)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs	(.../ClosingStructureUpdateDataStrategyTest.cs)	(revision 315ed3dc4af692b550a99bde20ea73d256b6efa9)
@@ -272,12 +272,12 @@
 
         [Test]
         [TestCaseSource(typeof(ClosingStructurePermutationHelper),
-            nameof(ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameId),
-            new object[]
-            {
-                "UpdateStructuresWithImportedData",
-                "UpdatesOnlySingleChange"
-            })]
+                        nameof(ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameId),
+                        new object[]
+                        {
+                            "UpdateStructuresWithImportedData",
+                            "UpdatesOnlySingleChange"
+                        })]
         public void UpdateStructuresWithImportedData_SingleChange_UpdatesOnlySingleChange(ClosingStructure readStructure)
         {
             // Setup