Index: Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs
===================================================================
diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision 76948e8765899b35776102ecd211d3d7575a9e4d)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -40,8 +40,7 @@
     {
         private MockRepository mocks;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
         }
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -36,8 +36,7 @@
     {
         private MockRepository mocks;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
         }
Index: Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs	(.../DialogBasedInquiryHelperTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs	(.../DialogBasedInquiryHelperTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -36,13 +36,17 @@
         private IWin32Window dialogParent;
         private MockRepository mocks;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             dialogParent = mocks.StrictMock<IWin32Window>();
         }
 
+        public override void TearDown()
+        {
+            mocks.VerifyAll();
+        }
+
         [Test]
         public void Constructor_WithoutDialogParent_ThrowsArgumentNullException()
         {
@@ -307,10 +311,5 @@
             Assert.AreEqual(query, actualQuery);
             mocks.VerifyAll();
         }
-
-        public override void TearDown()
-        {
-            mocks.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -36,13 +36,11 @@
     {
         private GuiFormsMessageWindow.MessageWindowLogAppender originalValue;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             originalValue = GuiFormsMessageWindow.MessageWindowLogAppender.Instance;
         }
 
-        [TearDown]
         public override void TearDown()
         {
             base.TearDown();
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -58,15 +58,13 @@
         private ITileSourceFactory tileFactory;
         private IWmtsCapabilityFactory wmtsCapabilityFactory;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mockRepository = new MockRepository();
             tileFactory = mockRepository.StrictMock<ITileSourceFactory>();
             wmtsCapabilityFactory = mockRepository.StrictMock<IWmtsCapabilityFactory>();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             mockRepository.VerifyAll();
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r7b372ed3506cd00bcf09c6c026e2bf5783868f74 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 7b372ed3506cd00bcf09c6c026e2bf5783868f74)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -56,8 +56,7 @@
         private TreeNodeInfo info;
         private IContextMenuBuilderProvider contextMenuBuilderProvider;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             contextMenuBuilderProvider = mocks.Stub<IContextMenuBuilderProvider>();
@@ -70,6 +69,13 @@
             info = treeNodeInfoLookup[typeof(MapDataCollection)];
         }
 
+        public override void TearDown()
+        {
+            mapLegendView.Dispose();
+
+            mocks.VerifyAll();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -534,12 +540,5 @@
                 Assert.DoesNotThrow(call);
             }
         }
-
-        public override void TearDown()
-        {
-            mapLegendView.Dispose();
-
-            mocks.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -68,8 +68,7 @@
         private MockRepository mocks;
         private ClosingStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -81,7 +80,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresCalculationContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -82,8 +82,7 @@
         private MockRepository mocks;
         private ClosingStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -95,7 +94,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresCalculationGroupContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -67,15 +67,13 @@
         private ClosingStructuresPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocksRepository = new MockRepository();
             plugin = new ClosingStructuresPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresFailureMechanismContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/UpdateInfos/ClosingStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -rcda0b786ef4c81469fb4213e7fc82cb74493fcf9 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/UpdateInfos/ClosingStructuresContextUpdateInfoTest.cs	(.../ClosingStructuresContextUpdateInfoTest.cs)	(revision cda0b786ef4c81469fb4213e7fc82cb74493fcf9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/UpdateInfos/ClosingStructuresContextUpdateInfoTest.cs	(.../ClosingStructuresContextUpdateInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -47,14 +47,12 @@
         private UpdateInfo updateInfo;
         private ClosingStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new ClosingStructuresPlugin();
             updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(ClosingStructuresContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -42,8 +42,7 @@
         private MockRepository mockRepository;
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mockRepository = new MockRepository();
         }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -66,14 +66,21 @@
         private GrassCoverErosionInwardsPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             plugin = new GrassCoverErosionInwardsPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionInwardsCalculationContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -1126,13 +1133,5 @@
                                                            Orientation = 10
                                                        }));
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -82,8 +82,7 @@
         private MockRepository mocks;
         private GrassCoverErosionInwardsPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -95,6 +94,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionInwardsCalculationGroupContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -1879,13 +1886,5 @@
                                                            Orientation = 10
                                                        }));
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -64,14 +64,21 @@
         private GrassCoverErosionInwardsPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocksRepository = new MockRepository();
             plugin = new GrassCoverErosionInwardsPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionInwardsFailureMechanismContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocksRepository.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -848,13 +855,5 @@
                 }
             }
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocksRepository.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -63,15 +63,13 @@
         private GrassCoverErosionOutwardsPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             plugin = new GrassCoverErosionOutwardsPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r43b7b00322555d3a683e41c53ecda3fd135c5c37 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 43b7b00322555d3a683e41c53ecda3fd135c5c37)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -86,8 +86,7 @@
         private GrassCoverErosionOutwardsPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -98,7 +97,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -67,15 +67,13 @@
         private HeightStructuresPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             plugin = new HeightStructuresPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HeightStructuresCalculationContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -81,8 +81,7 @@
         private MockRepository mocks;
         private HeightStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             guiStub = mocks.Stub<IGui>();
@@ -94,6 +93,14 @@
             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()
         {
@@ -1798,13 +1805,5 @@
                                              Location = structure.Location
                                          }));
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -67,14 +67,21 @@
         private HeightStructuresPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocksRepository = new MockRepository();
             plugin = new HeightStructuresPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HeightStructuresFailureMechanismContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocksRepository.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -868,13 +875,5 @@
                 }
             }
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocksRepository.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -r29f8839db0d355e3213456f6abf8ea7a88d44518 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs	(.../HeightStructuresContextUpdateInfoTest.cs)	(revision 29f8839db0d355e3213456f6abf8ea7a88d44518)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs	(.../HeightStructuresContextUpdateInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -47,14 +47,12 @@
         private UpdateInfo updateInfo;
         private HeightStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new HeightStructuresPlugin();
             updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(HeightStructuresContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -48,14 +48,12 @@
         private ITileSourceFactory tileFactory;
         private static readonly string testPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms);
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mockRepository = new MockRepository();
             tileFactory = mockRepository.StrictMock<ITileSourceFactory>();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             mockRepository.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -53,15 +53,13 @@
         private const int probabilitySpaceColumnIndex = 4;
         private Form testForm;
 
-        [SetUp]
         public override void Setup()
         {
             base.Setup();
 
             testForm = new Form();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             testForm.Dispose();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -54,8 +54,7 @@
 
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mockRepository = new MockRepository();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -61,8 +61,7 @@
         private readonly string testDataPathNoSettings = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms, "HydraulicBoundaryDatabaseNoSettings");
         private readonly string testDataPathInvalidSettings = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms, "HydraulicBoundaryDatabaseSettingsInvalid");
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -54,8 +54,7 @@
 
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mockRepository = new MockRepository();
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -r4f7dea208a70e4e3862a47a44028d6601e6f695f -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision 4f7dea208a70e4e3862a47a44028d6601e6f695f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -53,15 +53,13 @@
         private const int selectableHydraulicBoundaryLocationsColumnIndex = 4;
         private Form testForm;
 
-        [SetUp]
         public override void Setup()
         {
             base.Setup();
 
             testForm = new Form();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             base.TearDown();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -49,15 +49,13 @@
         private const int failureProbabilityColumnIndex = 3;
         private Form testForm;
 
-        [SetUp]
         public override void Setup()
         {
             base.Setup();
 
             testForm = new Form();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             base.TearDown();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs	(.../RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs	(.../RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -46,14 +46,12 @@
         private ImportInfo importInfo;
         private MacroStabilityInwardsPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new MacroStabilityInwardsPlugin();
             importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(RingtoetsMacroStabilityInwardsSurfaceLinesContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs	(.../StochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs	(.../StochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -46,14 +46,12 @@
         private ImportInfo importInfo;
         private MacroStabilityInwardsPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new MacroStabilityInwardsPlugin();
             importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -91,6 +91,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(MacroStabilityInwardsCalculationGroupContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -1348,13 +1356,5 @@
             CollectionAssert.DoesNotContain(parentGroup.Children, group);
             CollectionAssert.DoesNotContain(sectionResults[0].GetCalculationScenarios(macroStabilityInwardsFailureMechanism.Calculations.OfType<MacroStabilityInwardsCalculationScenario>()), calculation);
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -67,6 +67,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(MacroStabilityInwardsCalculationScenarioContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -720,13 +728,5 @@
                 }
             }
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -69,6 +69,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(MacroStabilityInwardsFailureMechanismContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -811,13 +819,5 @@
                 }
             }
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -58,15 +58,13 @@
         private const int exitPointLColumnIndex = 8;
         private Form testForm;
 
-        [SetUp]
         public override void Setup()
         {
             base.Setup();
 
             testForm = new Form();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             base.TearDown();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -52,15 +52,13 @@
         private const int failureProbabilitySellmeijerColumnIndex = 6;
         private Form testForm;
 
-        [SetUp]
         public override void Setup()
         {
             base.Setup();
 
             testForm = new Form();
         }
 
-        [TearDown]
         public override void TearDown()
         {
             base.TearDown();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs	(.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs	(.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -46,14 +46,12 @@
         private ImportInfo importInfo;
         private PipingPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new PipingPlugin();
             importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(RingtoetsPipingSurfaceLinesContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs	(.../StochasticSoilModelCollectionContextImportInfoTest.cs)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs	(.../StochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -46,14 +46,12 @@
         private ImportInfo importInfo;
         private PipingPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new PipingPlugin();
             importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -94,6 +94,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingCalculationGroupContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -1864,13 +1872,5 @@
             surfaceLine.SetDikeToeAtRiverAt(new Point3D(2, 0, 3));
             surfaceLine.SetDikeToeAtPolderAt(new Point3D(3, 0, 0));
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -70,6 +70,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingCalculationScenarioContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -1062,13 +1070,5 @@
                 }
             };
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -69,6 +69,14 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingFailureMechanismContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -811,13 +819,5 @@
                 }
             }
         }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -67,14 +67,21 @@
         private StabilityPointStructuresPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             plugin = new StabilityPointStructuresPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StabilityPointStructuresCalculationContext));
         }
 
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -1147,14 +1154,6 @@
             Assert.IsNull(result.Calculation);
         }
 
-        public override void TearDown()
-        {
-            plugin.Dispose();
-            mocks.VerifyAll();
-
-            base.TearDown();
-        }
-
         private static void ChangeStructure(StabilityPointStructure structure)
         {
             structure.CopyProperties(new StabilityPointStructure(
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -81,8 +81,7 @@
         private MockRepository mocks;
         private StabilityPointStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -94,7 +93,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StabilityPointStructuresCalculationGroupContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -65,8 +65,7 @@
 
         private MockRepository mocksRepository;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocksRepository = new MockRepository();
         }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/UpdateInfos/StabilityPointStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -rb9588439685292e10bcf3a4fcebfc187fd7bd03e -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/UpdateInfos/StabilityPointStructuresContextUpdateInfoTest.cs	(.../StabilityPointStructuresContextUpdateInfoTest.cs)	(revision b9588439685292e10bcf3a4fcebfc187fd7bd03e)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/UpdateInfos/StabilityPointStructuresContextUpdateInfoTest.cs	(.../StabilityPointStructuresContextUpdateInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -47,14 +47,12 @@
         private UpdateInfo updateInfo;
         private StabilityPointStructuresPlugin plugin;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             plugin = new StabilityPointStructuresPlugin();
             updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(StabilityPointStructuresContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -63,15 +63,13 @@
         private StabilityStoneCoverPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             plugin = new StabilityStoneCoverPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -79,8 +79,7 @@
         private StabilityStoneCoverPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -91,7 +90,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -65,15 +65,13 @@
         private WaveImpactAsphaltCoverPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             plugin = new WaveImpactAsphaltCoverPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r38499aa6936706c30ac12e481233d3f13545dd8b
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6d1940005967399be0d9c6fdda3952d6024b97d)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
@@ -82,8 +82,7 @@
         private WaveImpactAsphaltCoverPlugin plugin;
         private TreeNodeInfo info;
 
-        [SetUp]
-        public void SetUp()
+        public override void Setup()
         {
             mocks = new MockRepository();
             gui = mocks.Stub<IGui>();
@@ -94,7 +93,6 @@
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext));
         }
 
-        [TearDown]
         public override void TearDown()
         {
             plugin.Dispose();