Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs
===================================================================
diff -u -r636633d6507bef2735fd9b712b3a20feb3ac88c4 -rffe405e6b0f8b4d10e6be78cf7735c554eb42a93
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs	(.../HeightStructuresScenariosViewIntegrationTest.cs)	(revision 636633d6507bef2735fd9b712b3a20feb3ac88c4)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs	(.../HeightStructuresScenariosViewIntegrationTest.cs)	(revision ffe405e6b0f8b4d10e6be78cf7735c554eb42a93)
@@ -27,12 +27,14 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.Views;
 using Ringtoets.HeightStructures.IO;
 using Ringtoets.Integration.Data;
+using Ringtoets.Integration.TestUtils;
 
 namespace Ringtoets.HeightStructures.Integration.Test
 {
@@ -49,7 +51,7 @@
             using (var form = new Form())
             {
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-                IntegrationTestHelper.ImportReferenceLine(assessmentSection);
+                DataImportHelper.ImportReferenceLine(assessmentSection);
 
                 var view = new HeightStructuresScenariosView
                 {
@@ -65,7 +67,8 @@
                 Assert.AreEqual(0, dataGridView.RowCount);
 
                 // Call
-                IntegrationTestHelper.ImportFailureMechanismSections(assessmentSection, assessmentSection.HeightStructures);
+                IFailureMechanism failureMechanism = assessmentSection.HeightStructures;
+                DataImportHelper.ImportFailureMechanismSections(assessmentSection, failureMechanism);
                 assessmentSection.HeightStructures.NotifyObservers();
 
                 // Assert
@@ -84,8 +87,9 @@
             using (var form = new Form())
             {
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-                IntegrationTestHelper.ImportReferenceLine(assessmentSection);
-                IntegrationTestHelper.ImportFailureMechanismSections(assessmentSection, assessmentSection.HeightStructures);
+                DataImportHelper.ImportReferenceLine(assessmentSection);
+                IFailureMechanism failureMechanism = assessmentSection.HeightStructures;
+                DataImportHelper.ImportFailureMechanismSections(assessmentSection, failureMechanism);
                 new HeightStructuresImporter(assessmentSection.HeightStructures.HeightStructures,
                                              assessmentSection.ReferenceLine,
                                              filePath)
@@ -131,8 +135,9 @@
             using (var form = new Form())
             {
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-                IntegrationTestHelper.ImportReferenceLine(assessmentSection);
-                IntegrationTestHelper.ImportFailureMechanismSections(assessmentSection, assessmentSection.HeightStructures);
+                DataImportHelper.ImportReferenceLine(assessmentSection);
+                IFailureMechanism failureMechanism = assessmentSection.HeightStructures;
+                DataImportHelper.ImportFailureMechanismSections(assessmentSection, failureMechanism);
                 new HeightStructuresImporter(assessmentSection.HeightStructures.HeightStructures,
                                              assessmentSection.ReferenceLine,
                                              filePath)
@@ -184,8 +189,9 @@
             using (var form = new Form())
             {
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-                IntegrationTestHelper.ImportReferenceLine(assessmentSection);
-                IntegrationTestHelper.ImportFailureMechanismSections(assessmentSection, assessmentSection.HeightStructures);
+                DataImportHelper.ImportReferenceLine(assessmentSection);
+                IFailureMechanism failureMechanism = assessmentSection.HeightStructures;
+                DataImportHelper.ImportFailureMechanismSections(assessmentSection, failureMechanism);
                 new HeightStructuresImporter(assessmentSection.HeightStructures.HeightStructures,
                                              assessmentSection.ReferenceLine,
                                              filePath)