Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs
===================================================================
diff -u -r80b447a18c4d1abf1b4a7155f863f4faaed45ba6 -re45c4de1ffabe66b3b49123abc2e4e6c951435f5
--- Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs	(.../AddNewDemoDikeAssessmentSectionCommandTest.cs)	(revision 80b447a18c4d1abf1b4a7155f863f4faaed45ba6)
+++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs	(.../AddNewDemoDikeAssessmentSectionCommandTest.cs)	(revision e45c4de1ffabe66b3b49123abc2e4e6c951435f5)
@@ -34,7 +34,7 @@
         }
 
         [Test]
-        public void Execute_GuiIsProperlyInitialized_AddNewDemoProjectToRootProject()
+        public void Execute_GuiIsProperlyInitialized_AddNewDikeAssessmentSectionWithDemoDataToRootProject()
         {
             // Setup
             var project = new Project();
@@ -49,8 +49,10 @@
             observerMock.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var command = new AddNewDemoDikeAssessmentSectionCommand();
-            command.Gui = guiMock;
+            var command = new AddNewDemoDikeAssessmentSectionCommand
+            {
+                Gui = guiMock
+            };
 
             project.Attach(observerMock);
 
Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDuneAssessmentSectionCommandTest.cs
===================================================================
diff -u -r80b447a18c4d1abf1b4a7155f863f4faaed45ba6 -re45c4de1ffabe66b3b49123abc2e4e6c951435f5
--- Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDuneAssessmentSectionCommandTest.cs	(.../AddNewDemoDuneAssessmentSectionCommandTest.cs)	(revision 80b447a18c4d1abf1b4a7155f863f4faaed45ba6)
+++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDuneAssessmentSectionCommandTest.cs	(.../AddNewDemoDuneAssessmentSectionCommandTest.cs)	(revision e45c4de1ffabe66b3b49123abc2e4e6c951435f5)
@@ -31,7 +31,7 @@
         }
 
         [Test]
-        public void Execute_GuiIsProperlyInitialized_AddNewDemoProjectToRootProject()
+        public void Execute_GuiIsProperlyInitialized_AddNewDuneAssessmentSectionWithDemoDataToRootProject()
         {
             // Setup
             var project = new Project();
@@ -46,8 +46,10 @@
             observerMock.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var command = new AddNewDemoDuneAssessmentSectionCommand();
-            command.Gui = guiMock;
+            var command = new AddNewDemoDuneAssessmentSectionCommand
+            {
+                Gui = guiMock
+            };
 
             project.Attach(observerMock);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -r5c044a6799b45bec77af170dca0a84bc434c5f6f -re45c4de1ffabe66b3b49123abc2e4e6c951435f5
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 5c044a6799b45bec77af170dca0a84bc434c5f6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision e45c4de1ffabe66b3b49123abc2e4e6c951435f5)
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 
 using Core.Common.Base;
@@ -9,6 +10,7 @@
 
 using Rhino.Mocks;
 
+using Ringtoets.Common.Data;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.NodePresenters;
 
@@ -59,55 +61,34 @@
         public void GetChildNodeObjects_DataIsDikeAssessmentSection_ReturnDikeInputsAndFailureMechanisms()
         {
             // Setup
+            var assessmentSection = new AssessmentSectionBaseTester();
+
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
+
+            assessmentSection.FailureMechanismsInjectionPoint = new[]
+            {
+                mocks.StrictMock<IFailureMechanism>(),
+                mocks.StrictMock<IFailureMechanism>(),
+                mocks.StrictMock<IFailureMechanism>(),
+                mocks.StrictMock<IFailureMechanism>(),
+            };
             mocks.ReplayAll();
 
             var nodePresenter = new AssessmentSectionBaseNodePresenter();
 
-            var assessmentSection = new DikeAssessmentSection();
 
-            // Call
-            var children = nodePresenter.GetChildNodeObjects(assessmentSection, nodeMock).Cast<object>().AsList();
 
-            // Assert
-            Assert.AreEqual(12, children.Count);
-            Assert.AreSame(assessmentSection.ReferenceLine, children[0]);
-            Assert.AreSame(assessmentSection.FailureMechanismContribution, children[1]);
-            Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, children[2]);
-            Assert.AreSame(assessmentSection.PipingFailureMechanism, children[3]);
-            Assert.AreSame(assessmentSection.GrassErosionFailureMechanism, children[4]);
-            Assert.AreSame(assessmentSection.MacrostabilityInwardFailureMechanism, children[5]);
-            Assert.AreSame(assessmentSection.OvertoppingFailureMechanism, children[6]);
-            Assert.AreSame(assessmentSection.ClosingFailureMechanism, children[7]);
-            Assert.AreSame(assessmentSection.FailingOfConstructionFailureMechanism, children[8]);
-            Assert.AreSame(assessmentSection.StoneRevetmentFailureMechanism, children[9]);
-            Assert.AreSame(assessmentSection.AsphaltRevetmentFailureMechanism, children[10]);
-            Assert.AreSame(assessmentSection.GrassRevetmentFailureMechanism, children[11]);
-            mocks.VerifyAll(); // Expect no calls on tree node
-        }
 
-        [Test]
-        public void GetChildNodeObjects_DataIsDuneAssessmentSection_ReturnDuneInputsAndFailureMechanisms()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var nodeMock = mocks.StrictMock<ITreeNode>();
-            mocks.ReplayAll();
-
-            var nodePresenter = new AssessmentSectionBaseNodePresenter();
-
-            var assessmentSection = new DuneAssessmentSection();
-
             // Call
             var children = nodePresenter.GetChildNodeObjects(assessmentSection, nodeMock).Cast<object>().AsList();
 
             // Assert
-            Assert.AreEqual(4, children.Count);
+            Assert.AreEqual(7, children.Count);
             Assert.AreSame(assessmentSection.ReferenceLine, children[0]);
             Assert.AreSame(assessmentSection.FailureMechanismContribution, children[1]);
             Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, children[2]);
-            Assert.AreSame(assessmentSection.DuneErosionFailureMechanism, children[3]);
+            CollectionAssert.AreEqual(assessmentSection.GetFailureMechanisms(), children.Skip(3));
             mocks.VerifyAll(); // Expect no calls on tree node
         }
 
@@ -383,5 +364,21 @@
             CollectionAssert.DoesNotContain(project.Items, assessmentSection);
             mocks.VerifyAll();
         }
+
+        private class AssessmentSectionBaseTester : AssessmentSectionBase
+        {
+            public AssessmentSectionBaseTester()
+            {
+                FailureMechanismsInjectionPoint = new IFailureMechanism[0];
+            }
+
+            public IEnumerable<IFailureMechanism> FailureMechanismsInjectionPoint { get; set; }
+
+            public override IEnumerable<IFailureMechanism> GetFailureMechanisms()
+            {
+                return FailureMechanismsInjectionPoint;
+
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs
===================================================================
diff -u -r5c044a6799b45bec77af170dca0a84bc434c5f6f -re45c4de1ffabe66b3b49123abc2e4e6c951435f5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs	(.../RingtoetsApplicationPluginTest.cs)	(revision 5c044a6799b45bec77af170dca0a84bc434c5f6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs	(.../RingtoetsApplicationPluginTest.cs)	(revision e45c4de1ffabe66b3b49123abc2e4e6c951435f5)
@@ -46,7 +46,7 @@
             DataItemInfo duneAssessmentDataItemDefinition = dataItemDefinitions.Single(did => did.ValueType == typeof(DuneAssessmentSection));
             Assert.AreEqual("Duintraject", duneAssessmentDataItemDefinition.Name);
             Assert.AreEqual("Algemeen", duneAssessmentDataItemDefinition.Category);
-            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.AssessmentSectionFolderIcon, dikeAssessmentSectionDataItemDefinition.Image);
+            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.AssessmentSectionFolderIcon, duneAssessmentDataItemDefinition.Image);
             Assert.IsNull(duneAssessmentDataItemDefinition.AdditionalOwnerCheck);
             Assert.IsInstanceOf<DuneAssessmentSection>(duneAssessmentDataItemDefinition.CreateData(null));
             Assert.IsNull(duneAssessmentDataItemDefinition.AddExampleData);