Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -r1da7a31b01a917278adefdefd61276733b31a0bb -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 1da7a31b01a917278adefdefd61276733b31a0bb)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea)
@@ -333,7 +333,7 @@
 
         private static bool CloseFailureMechanismResultViewForData(DuneErosionFailureMechanismResultView view, object dataToCloseFor)
         {
-            DuneErosionFailureMechanism failureMechanism = dataToCloseFor as DuneErosionFailureMechanism;
+            var failureMechanism = dataToCloseFor as DuneErosionFailureMechanism;
 
             if (dataToCloseFor is IAssessmentSection assessmentSection)
             {
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -r351b00f0c30e2e39c4eb973273a8d75ed9e740da -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs	(.../GrassCoverErosionInwardsScenariosViewInfoTest.cs)	(revision 351b00f0c30e2e39c4eb973273a8d75ed9e740da)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs	(.../GrassCoverErosionInwardsScenariosViewInfoTest.cs)	(revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea)
@@ -180,7 +180,6 @@
         [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnFalse()
         {
-            // Setup
             using (var view = new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism()))
             {
                 // Call
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -ra02b4202401421f99913b595873ba79211aa01d7 -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs)	(revision a02b4202401421f99913b595873ba79211aa01d7)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs)	(revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea)
@@ -214,6 +214,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
+            
             using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Call
@@ -235,6 +236,7 @@
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var context = new MacroStabilityInwardsFailurePathContext(failureMechanism, assessmentSection);
+            
             using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Call
@@ -255,6 +257,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
+            
             using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 var context = new MacroStabilityInwardsFailurePathContext(
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -r6f58444a2298b80b5c51f121312321e67aad3a62 -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs	(.../MacroStabilityInwardsScenariosViewInfoTest.cs)	(revision 6f58444a2298b80b5c51f121312321e67aad3a62)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs	(.../MacroStabilityInwardsScenariosViewInfoTest.cs)	(revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea)
@@ -170,7 +170,6 @@
         [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnFalse()
         {
-            // Setup
             using (var view = new MacroStabilityInwardsScenariosView(new CalculationGroup(), new MacroStabilityInwardsFailureMechanism()))
             {
                 // Call
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r346e3bd5b6e827603dbefdee9d1df0f37585c55f -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 346e3bd5b6e827603dbefdee9d1df0f37585c55f)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea)
@@ -590,6 +590,15 @@
 
         #region ViewInfos
 
+        private static bool ClosePipingFailurePathViewForData(PipingFailurePathView view, object dataToCloseFor)
+        {
+            var assessmentSection = dataToCloseFor as IAssessmentSection;
+            var pipingFailureMechanism = dataToCloseFor as PipingFailureMechanism;
+            return assessmentSection != null
+                       ? ReferenceEquals(view.AssessmentSection, assessmentSection)
+                       : ReferenceEquals(view.FailureMechanism, pipingFailureMechanism);
+        }
+
         private static bool CloseFailureMechanismResultViewForData(PipingFailureMechanismResultView view, object dataToCloseFor)
         {
             var failureMechanism = dataToCloseFor as PipingFailureMechanism;
@@ -609,15 +618,6 @@
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
         }
 
-        private static bool ClosePipingFailurePathViewForData(PipingFailurePathView view, object dataToCloseFor)
-        {
-            var assessmentSection = dataToCloseFor as IAssessmentSection;
-            var pipingFailureMechanism = dataToCloseFor as PipingFailureMechanism;
-            return assessmentSection != null
-                       ? ReferenceEquals(view.AssessmentSection, assessmentSection)
-                       : ReferenceEquals(view.FailureMechanism, pipingFailureMechanism);
-        }
-
         private static bool ClosePipingCalculationsViewForData(PipingCalculationsView view, object dataToCloseFor)
         {
             PipingFailureMechanism failureMechanism = null;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r150102801fd887fe60097f04b50614ebf67e7b07 -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 150102801fd887fe60097f04b50614ebf67e7b07)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea)
@@ -210,6 +210,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
+
             using (var view = new PipingFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Call
@@ -231,6 +232,7 @@
 
             var failureMechanism = new PipingFailureMechanism();
             var context = new PipingFailurePathContext(failureMechanism, assessmentSection);
+
             using (var view = new PipingFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Call
@@ -251,6 +253,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
+
             using (var view = new PipingFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 var context = new PipingFailurePathContext(