Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -re307926e2a3a356a01bb80c1333738719ef09d4d
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision e307926e2a3a356a01bb80c1333738719ef09d4d)
@@ -21,14 +21,12 @@
 
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base;
 using Core.Common.Util.Extensions;
 using Core.Common.Util.Reflection;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
-using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
@@ -56,20 +54,6 @@
         private const int manualAssemblyCategoryGroupIndex = 9;
         private const int columnCount = 10;
 
-        private Form testForm;
-
-        [SetUp]
-        public void Setup()
-        {
-            testForm = new Form();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            testForm.Dispose();
-        }
-
         [Test]
         public void Constructor_ExpectedValues()
         {
@@ -93,8 +77,13 @@
         public void GivenFormWithFailureMechanismResultView_ThenExpectedColumnsAreAdded()
         {
             // Given
-            using (ShowFailureMechanismResultsView(new PipingStructureFailureMechanism()))
+            using (var form = new Form())
+            using (var view = new PipingStructureResultView(new ObservableList<PipingStructureFailureMechanismSectionResult>(),
+                                                            new PipingStructureFailureMechanism()))
             {
+                form.Controls.Add(view);
+                form.Show();
+
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -149,9 +138,12 @@
             });
 
             // Call
+            using (var form = new Form())
             using (new AssemblyToolCalculatorFactoryConfig())
-            using (ShowFailureMechanismResultsView(failureMechanism))
+            using (var view = new PipingStructureResultView(failureMechanism.SectionResults, failureMechanism))
             {
+                form.Controls.Add(view);
+                form.Show();
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Assert
@@ -230,32 +222,6 @@
             }
         }
 
-        [Test]
-        public void GivenFailureMechanismResultsViewWithManualAssembly_WhenShown_ThenManualAssemblyUsed()
-        {
-            // Given
-            var failureMechanism = new PipingStructureFailureMechanism();
-            FailureMechanismTestHelper.SetSections(failureMechanism, new[]
-            {
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
-            });
-
-            PipingStructureFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
-            sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.Iv;
-            sectionResult.UseManualAssemblyCategoryGroup = true;
-
-            // When
-            using (new AssemblyToolCalculatorFactoryConfig())
-            using (ShowFailureMechanismResultsView(failureMechanism))
-            {
-                // Then
-                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
-                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
-                                calculator.FailureMechanismSectionCategories.Single());
-            }
-        }
-
         [TestFixture]
         public class PipingStructureFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture<
             PipingStructureResultView,
@@ -276,17 +242,6 @@
             return control;
         }
 
-        private PipingStructureResultView ShowFailureMechanismResultsView(
-            PipingStructureFailureMechanism failureMechanism)
-        {
-            var failureMechanismResultView = new PipingStructureResultView(failureMechanism.SectionResults,
-                                                                                     failureMechanism);
-            testForm.Controls.Add(failureMechanismResultView);
-            testForm.Show();
-
-            return failureMechanismResultView;
-        }
-
         private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
             return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");