Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -r9d7a5bd6246ec71a14f1944516d21e06954243f7 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs	(.../HeightStructuresFailureMechanismSectionResult.cs)	(revision 9d7a5bd6246ec71a14f1944516d21e06954243f7)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs	(.../HeightStructuresFailureMechanismSectionResult.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -42,7 +42,7 @@
         public HeightStructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
         {
             assessmentLayerTwoA = double.NaN;
-            AssessmentLayerThree = (RoundedDouble)double.NaN;
+            AssessmentLayerThree = (RoundedDouble) double.NaN;
         }
 
         /// <summary>
@@ -68,4 +68,4 @@
 
         public long StorageId { get; set; }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/AssemblyInfo.cs
===================================================================
diff -u -r213b20e92891887167ab4b031ca4a4b6250a4c2a -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -26,4 +26,4 @@
 [assembly: AssemblyTitle("Ringtoets.HeightStructures.Data")]
 [assembly: AssemblyProduct("Ringtoets.HeightStructures.Data")]
 [assembly: Guid("418e2cad-51d3-4f2b-8fc4-0092b987f810")]
-[assembly: InternalsVisibleTo("Ringtoets.HeightStructures.Data.Test")]
+[assembly: InternalsVisibleTo("Ringtoets.HeightStructures.Data.Test")]
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -27,7 +27,6 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HeightStructures.Data;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -rfa2a0dff6598123689fc7a69745440215879a243 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision fa2a0dff6598123689fc7a69745440215879a243)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -49,25 +49,20 @@
 
             // The concat is needed to observe the input of calculations in child groups.
             calculationInputObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
-                UpdateDataGridViewDataSource, 
+                UpdateDataGridViewDataSource,
                 cg => cg.Children.Concat<object>(
                     cg.Children
-                        .OfType<ICalculation>()
-                        .Select(c => c.GetObservableInput())
-                )
-            );
+                      .OfType<ICalculation>()
+                      .Select(c => c.GetObservableInput())));
             calculationOutputObserver = new RecursiveObserver<CalculationGroup, ICalculationOutput>(
-                UpdateDataGridViewDataSource, 
+                UpdateDataGridViewDataSource,
                 cg => cg.Children.Concat<object>(
                     cg.Children
-                        .OfType<ICalculation>()
-                        .Select(c => c.GetObservableOutput())
-                )
-            );
+                      .OfType<ICalculation>()
+                      .Select(c => c.GetObservableOutput())));
             calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
-                UpdateDataGridViewDataSource, 
-                c => c.Children
-            );
+                UpdateDataGridViewDataSource,
+                c => c.Children);
 
             AddDataGridColumns();
         }
@@ -98,33 +93,29 @@
             base.Dispose(disposing);
         }
 
+        protected override object CreateFailureMechanismSectionResultRow(HeightStructuresFailureMechanismSectionResult sectionResult)
+        {
+            return new HeightStructuresFailureMechanismSectionResultRow(sectionResult);
+        }
+
         private void AddDataGridColumns()
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<HeightStructuresFailureMechanismSectionResultRow>(sr => sr.Name),
                 RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
-                true
-                );
+                true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<HeightStructuresFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerOne),
-                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one
-                );
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<HeightStructuresFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, 
-                true
-                );
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                true);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<HeightStructuresFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerThree),
-                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three
-                );
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
-        protected override object CreateFailureMechanismSectionResultRow(HeightStructuresFailureMechanismSectionResult sectionResult)
-        {
-            return new HeightStructuresFailureMechanismSectionResultRow(sectionResult);
-        }
-
         private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
         {
             if (eventArgs.ColumnIndex > 1)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r9d7a5bd6246ec71a14f1944516d21e06954243f7 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs	(.../HeightStructuresFailureMechanismSectionResultRow.cs)	(revision 9d7a5bd6246ec71a14f1944516d21e06954243f7)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs	(.../HeightStructuresFailureMechanismSectionResultRow.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -21,7 +21,6 @@
 
 using System;
 using System.ComponentModel;
-
 using Core.Common.Base.Data;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.TypeConverters;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Properties/AssemblyInfo.cs
===================================================================
diff -u -r07efb7c80815d1747386437cf8dcd6db25b9160a -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 07efb7c80815d1747386437cf8dcd6db25b9160a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -24,4 +24,4 @@
 
 [assembly: AssemblyTitle("Ringtoets.HeightStructures.IO")]
 [assembly: AssemblyProduct("Ringtoets.HeightStructures.IO")]
-[assembly: Guid("12120d08-ba7a-48f1-bba5-2903570a4330")]
+[assembly: Guid("12120d08-ba7a-48f1-bba5-2903570a4330")]
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj
===================================================================
diff -u -r1795be9025cb0e054dca86a5275203966c0a9b2a -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 1795be9025cb0e054dca86a5275203966c0a9b2a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -75,11 +75,6 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
-      <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
-      <Name>Ringtoets.Common.Service</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r150366ef474f9522b3af857c29e3eac484910700 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 150366ef474f9522b3af857c29e3eac484910700)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -75,14 +75,15 @@
 
             CalculationServiceHelper.PerformCalculation(
                 calculation.Name,
-                () => {
+                () =>
+                {
                     HydraRingCalculationService.PerformCalculation(
-                        hlcdDirectory, 
-                        ringId, 
-                        HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, 
-                        HydraRingUncertaintiesType.All, 
+                        hlcdDirectory,
+                        ringId,
+                        HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta,
+                        HydraRingUncertaintiesType.All,
                         input,
-                        new []
+                        new[]
                         {
                             exceedanceProbabilityCalculationParser
                         });
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs	(.../HeightStructuresFailureMechanismSectionResultTest.cs)	(revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs	(.../HeightStructuresFailureMechanismSectionResultTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -86,15 +86,15 @@
             FailureMechanismSection section = CreateSection();
             var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section);
 
-            RoundedDouble assessmentLayerThree = (RoundedDouble)newValue;
+            RoundedDouble assessmentLayerThree = (RoundedDouble) newValue;
 
             // Call
             failureMechanismSectionResult.AssessmentLayerThree = assessmentLayerThree;
 
             // Assert
             Assert.AreEqual(assessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree);
         }
-        
+
         private static FailureMechanismSection CreateSection()
         {
             return new FailureMechanismSection("test", new[]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -278,7 +278,7 @@
             var input = new HeightStructuresInput();
 
             // Call
-            TestDelegate call = () => input.FailureProbabilityOfStructureGivenErosion = (RoundedDouble)failureProbabilityOfStructureGivenErosion;
+            TestDelegate call = () => input.FailureProbabilityOfStructureGivenErosion = (RoundedDouble) failureProbabilityOfStructureGivenErosion;
 
             // Assert
             var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Value_needs_to_be_between_0_and_1;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -re775448bfb8290e43d62340a53a08723bbc035c6 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs	(.../HeightStructuresCalculationGroupContextTest.cs)	(revision e775448bfb8290e43d62340a53a08723bbc035c6)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs	(.../HeightStructuresCalculationGroupContextTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -55,4 +55,4 @@
             mockRepository.VerifyAll();
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresFailureMechanismContextTest.cs
===================================================================
diff -u -re775448bfb8290e43d62340a53a08723bbc035c6 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresFailureMechanismContextTest.cs	(.../HeightStructuresFailureMechanismContextTest.cs)	(revision e775448bfb8290e43d62340a53a08723bbc035c6)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresFailureMechanismContextTest.cs	(.../HeightStructuresFailureMechanismContextTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -66,4 +66,4 @@
             Assert.AreEqual("parent", exception.ParamName);
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs	(.../HeightStructuresInputContextTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs	(.../HeightStructuresInputContextTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -84,4 +84,4 @@
             mocksRepository.VerifyAll();
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/FailureMechanismResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/FailureMechanismResultContextTreeNodeInfoTest.cs	(.../FailureMechanismResultContextTreeNodeInfoTest.cs)	(revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/FailureMechanismResultContextTreeNodeInfoTest.cs	(.../FailureMechanismResultContextTreeNodeInfoTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -29,7 +29,6 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Plugin;
-
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b647301c81c13810237268da2364d1568ad186d -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 4b647301c81c13810237268da2364d1568ad186d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -589,7 +589,7 @@
                 Version = "random"
             };
             hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
-            
+
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
@@ -668,7 +668,7 @@
                 Version = "random"
             };
             hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
-            
+
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
@@ -742,7 +742,6 @@
             // Assert
             Assert.AreEqual(1, group.Children.Count);
             CollectionAssert.DoesNotContain(group.Children, elementToBeRemoved);
-
         }
 
         private const int contextMenuValidateIndex = 0;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b647301c81c13810237268da2364d1568ad186d -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4b647301c81c13810237268da2364d1568ad186d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -68,14 +68,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HeightStructuresCalculationGroupContext));
         }
 
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
-
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -208,7 +200,7 @@
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
-            
+
             mocks.ReplayAll();
 
             using (var treeViewControl = new TreeViewControl())
@@ -364,8 +356,8 @@
             };
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -410,8 +402,8 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -456,8 +448,8 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -511,8 +503,8 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -549,8 +541,8 @@
             };
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -595,8 +587,8 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -641,8 +633,8 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -696,8 +688,8 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
-                                                                               failureMechanism,
-                                                                               assessmentSectionMock);
+                                                                       failureMechanism,
+                                                                       assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -1026,6 +1018,14 @@
             CollectionAssert.DoesNotContain(parentGroup.Children, group);
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         private const int contextMenuAddCalculationGroupIndexRootGroup = 0;
         private const int contextMenuAddCalculationIndexRootGroup = 1;
         private const int contextMenuValidateAllIndexRootGroup = 3;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b647301c81c13810237268da2364d1568ad186d -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4b647301c81c13810237268da2364d1568ad186d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -389,7 +389,7 @@
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
-            
+
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             using (var treeViewControl = new TreeViewControl())
@@ -543,7 +543,7 @@
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
-            
+
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             using (var treeViewControl = new TreeViewControl())
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision bd4baf94660bac291a78ee43b16afb20efc3e3c6)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -122,7 +122,6 @@
 
             // Assert
             TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
-
         }
 
         [Test]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -71,7 +71,7 @@
             using (ShowFailureMechanismResultsView())
             {
                 // Assert
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 Assert.AreEqual(4, dataGridView.ColumnCount);
                 Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly);
@@ -93,7 +93,7 @@
             // Setup
             using (var view = ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 var points = new[]
                 {
@@ -129,7 +129,7 @@
             var testData = new object();
             using (var view = ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 view.Data = testData;
@@ -147,7 +147,7 @@
             // Setup & Call
             using (ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Assert
                 var rows = dataGridView.Rows;
@@ -156,14 +156,14 @@
                 var cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
-                Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue);
+                Assert.IsFalse((bool) cells[assessmentLayerOneIndex].FormattedValue);
                 Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue);
                 Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue);
 
                 cells = rows[1].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue);
-                Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue);
+                Assert.IsFalse((bool) cells[assessmentLayerOneIndex].FormattedValue);
                 Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue);
                 Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue);
             }
@@ -177,7 +177,7 @@
             // Setup
             using (ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[assessmentLayerOneIndex].Value = checkBoxSelected;
@@ -191,7 +191,7 @@
                 var cellAssessmentLayerTwoA = cells[assessmentLayerTwoAIndex];
                 var cellAssessmentLayerThree = cells[assessmentLayerThreeIndex];
 
-                Assert.AreEqual(checkBoxSelected, (bool)cells[assessmentLayerOneIndex].FormattedValue);
+                Assert.AreEqual(checkBoxSelected, (bool) cells[assessmentLayerOneIndex].FormattedValue);
                 Assert.AreEqual("-", cellAssessmentLayerTwoA.FormattedValue);
                 Assert.AreEqual("-", cellAssessmentLayerThree.FormattedValue);
 
@@ -227,7 +227,7 @@
             // Setup
             using (ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[cellIndex].Value = newValue;
@@ -247,7 +247,7 @@
             // Setup
             using (var view = ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[cellIndex].Value = newValue;
@@ -261,7 +261,7 @@
 
                 var propertyValue = row.GetType().GetProperty(propertyName).GetValue(row, null);
 
-                Assert.AreEqual((RoundedDouble)double.Parse(newValue), propertyValue);
+                Assert.AreEqual((RoundedDouble) double.Parse(newValue), propertyValue);
             }
         }
 
@@ -271,11 +271,11 @@
             // Setup
             using (var view = ShowFullyConfiguredFailureMechanismResultsView())
             {
-                var sections = (List<HeightStructuresFailureMechanismSectionResult>)view.Data;
+                var sections = (List<HeightStructuresFailureMechanismSectionResult>) view.Data;
                 sections[0].AssessmentLayerOne = false;
 
                 var gridTester = new ControlTester("dataGridView");
-                var dataGridView = (DataGridView)gridTester.TheObject;
+                var dataGridView = (DataGridView) gridTester.TheObject;
                 var dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerOneIndex];
 
                 dataGridView.CurrentCell = dataGridViewCell;
@@ -328,4 +328,4 @@
             return failureMechanismResultView;
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r9d7a5bd6246ec71a14f1944516d21e06954243f7 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision 9d7a5bd6246ec71a14f1944516d21e06954243f7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -24,11 +24,8 @@
 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.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TypeConverters;
@@ -112,7 +109,7 @@
             var row = new HeightStructuresFailureMechanismSectionResultRow(result);
 
             // Call
-            row.AssessmentLayerThree = (RoundedDouble)newValue;
+            row.AssessmentLayerThree = (RoundedDouble) newValue;
 
             // Assert
             Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy());
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -32,7 +32,6 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.Views;
-
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Plugin.Test.ViewInfos
@@ -256,7 +255,7 @@
             {
                 Data = failureMechanism.SectionResults
             };
-            
+
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSectionMock);
 
             // Call
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -rf7b5ed585321bbc2249ec9c8ecd8af7f9eb1808a -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision f7b5ed585321bbc2249ec9c8ecd8af7f9eb1808a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -72,7 +72,11 @@
             {
                 Assert.IsNull(calculation.Output);
             }
-            CollectionAssert.AreEqual(new[] { calculation1, calculation2 }, affectedItems);
+            CollectionAssert.AreEqual(new[]
+            {
+                calculation1,
+                calculation2
+            }, affectedItems);
         }
 
         [Test]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/Ringtoets.HeightStructures.Service.Test.csproj
===================================================================
diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -r219bf641fa81657e9d154c9cb50245af9b2ebe27
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/Ringtoets.HeightStructures.Service.Test.csproj	(.../Ringtoets.HeightStructures.Service.Test.csproj)	(revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/Ringtoets.HeightStructures.Service.Test.csproj	(.../Ringtoets.HeightStructures.Service.Test.csproj)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
@@ -65,10 +65,6 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
@@ -81,14 +77,6 @@
       <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
       <Name>Ringtoets.HydraRing.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Integration\src\Ringtoets.Integration.Data\Ringtoets.Integration.Data.csproj">
-      <Project>{11F1F874-45AF-43E4-8AE5-15A5C9593E28}</Project>
-      <Name>Ringtoets.Integration.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Integration\src\Ringtoets.Integration.Plugin\Ringtoets.Integration.Plugin.csproj">
-      <Project>{C8383B76-B3F1-4E6E-B56C-527B469FA20A}</Project>
-      <Name>Ringtoets.Integration.Plugin</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.HeightStructures.Data\Ringtoets.HeightStructures.Data.csproj">
       <Project>{1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}</Project>
       <Name>Ringtoets.HeightStructures.Data</Name>