Index: Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj
===================================================================
diff -u -r1115fb4520d55c5018577d5160f70ee54896cf1a -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
+++ Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -137,7 +137,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <CodeAnalysisDictionary Include="Resources\chart.png" />
+    <Content Include="Resources\chart.png" />
     <Content Include="Resources\area.png" />
     <Content Include="Resources\document.png" />
     <Content Include="Resources\hand.png" />
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -ra163c5f082694baf5cd491ea36baf6fb040fe868 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision a163c5f082694baf5cd491ea36baf6fb040fe868)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -1471,7 +1471,7 @@
         {
             using (var dialog = new OpenFileDialog
             {
-                Filter = string.Format("{0} (*.sqlite)|*.sqlite", RingtoetsFormsResources.SelectHydraulicBoundaryDatabaseFile_FilterName),
+                Filter = $@"{RingtoetsFormsResources.SelectHydraulicBoundaryDatabaseFile_FilterName} (*.sqlite)|*.sqlite",
                 Title = GuiResources.OpenFileDialog_Title
             })
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs
===================================================================
diff -u -r9db37e24bcc2cc4dcec6bd9e32357d79ead17b15 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs	(.../DesignWaterLevelCalculationMessageProvider.cs)	(revision 9db37e24bcc2cc4dcec6bd9e32357d79ead17b15)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs	(.../DesignWaterLevelCalculationMessageProvider.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.Properties;
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs
===================================================================
diff -u -r4840075b1266d759456ee0bc4a0d561e428cf5f1 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs	(.../AssessmentSectionFromFileCommandHandlerTest.cs)	(revision 4840075b1266d759456ee0bc4a0d561e428cf5f1)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs	(.../AssessmentSectionFromFileCommandHandlerTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -141,7 +141,7 @@
             Action action = () => assessmentSectionFromFileCommandHandler.AddAssessmentSectionFromFile();
 
             // Assert
-            string expectedMessage = string.Format("De map met specificaties voor trajecten '{0}' is niet gevonden.", pathToNonExistingFolder);
+            string expectedMessage = $"De map met specificaties voor trajecten '{pathToNonExistingFolder}' is niet gevonden.";
             TestHelper.AssertLogMessageIsGenerated(action, expectedMessage);
             mockRepository.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -88,7 +88,7 @@
                 var compositionLabel = (Label) new ControlTester(assessmentSectionCompositionLabelName).TheObject;
 
                 string compositionDisplayName = new EnumDisplayWrapper<AssessmentSectionComposition>(newComposition).DisplayName;
-                string newCompositionValue = string.Format("Trajecttype: {0}", compositionDisplayName);
+                string newCompositionValue = $"Trajecttype: {compositionDisplayName}";
                 Assert.AreEqual(newCompositionValue, compositionLabel.Text);
 
                 Assert.IsTrue(dataGridInvalidated,
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionContextPropertyInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionContextPropertyInfoTest.cs	(.../FailureMechanismContributionContextPropertyInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionContextPropertyInfoTest.cs	(.../FailureMechanismContributionContextPropertyInfoTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
@@ -29,7 +28,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
@@ -68,7 +66,7 @@
             mocks.ReplayAll();
 
             using (var plugin = new RingtoetsPlugin())
-            {                
+            {
                 plugin.Gui = gui;
 
                 FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r68ad4c0477e2ae7f325fef005b88d5be5c563840 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 68ad4c0477e2ae7f325fef005b88d5be5c563840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -183,7 +183,7 @@
                     Action action = () => gui.SetProject(project, null);
 
                     // Then
-                    string fileMissingMessage = string.Format("Fout bij het lezen van bestand '{0}': het bestand bestaat niet.", nonExistingFileExistingFile);
+                    string fileMissingMessage = $"Fout bij het lezen van bestand '{nonExistingFileExistingFile}': het bestand bestaat niet.";
                     string message = string.Format(
                         RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
                         fileMissingMessage);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs
===================================================================
diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs	(.../ForeshoreProfileTreeNodeInfoTest.cs)	(revision 3178e116f5e59e03078d465efeb303c5e232c7bf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs	(.../ForeshoreProfileTreeNodeInfoTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -21,27 +21,15 @@
 
 using System.Drawing;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.ClosingStructures.Data;
-using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionOutwards.Data;
-using Ringtoets.HeightStructures.Data;
 using Ringtoets.Integration.Plugin.Properties;
-using Ringtoets.StabilityPointStructures.Data;
-using Ringtoets.StabilityStoneCover.Data;
-using Ringtoets.WaveImpactAsphaltCover.Data;
 
 namespace Ringtoets.Integration.Plugin.Test.TreeNodeInfos
 {
@@ -111,7 +99,7 @@
             // Assert
             TestHelper.AssertImagesAreEqual(Resources.Foreshore, image);
         }
-        
+
         [Test]
         public void ContextMenuStrip_Always_CallsBuilder()
         {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs
===================================================================
diff -u -r1bbf51443c907b5f202e80764fa05f2e7f842c04 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs	(.../RingtoetsProjectTreeNodeInfoTest.cs)	(revision 1bbf51443c907b5f202e80764fa05f2e7f842c04)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs	(.../RingtoetsProjectTreeNodeInfoTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -125,7 +125,7 @@
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
-                
+
                 // Call
                 object[] objects = info.ChildNodeObjects(project);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -37,10 +37,10 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.Integration.Data;
 using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Data.TestUtil;
 using Ringtoets.Revetment.Forms.PresentationObjects;
 using Ringtoets.Revetment.Forms.TestUtil;
 using Ringtoets.Revetment.Forms.Views;
-using Ringtoets.Revetment.Data.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.Data;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u -rc7cfd69ca9c95a190e7cc4d0f8184d0c69bbc1c2 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs	(.../WaveHeightCalculationMessageProviderTest.cs)	(revision c7cfd69ca9c95a190e7cc4d0f8184d0c69bbc1c2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs	(.../WaveHeightCalculationMessageProviderTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -74,7 +74,6 @@
             Assert.AreEqual(expectedMessage, message);
         }
 
-
         [Test]
         [TestCase(null)]
         [TestCase("")]
@@ -113,7 +112,6 @@
             Assert.AreEqual(expectedMessage, message);
         }
 
-
         [Test]
         [TestCase(null)]
         [TestCase("")]
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs
===================================================================
diff -u -ree69e9ae048b12022d18677c2773fb1bb0a6e229 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision ee69e9ae048b12022d18677c2773fb1bb0a6e229)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -47,7 +47,7 @@
     public class TestDataGeneratorTest
     {
         [Test]
-        public void GetAssessmentSectionWithAllCalculationConfigurations_NoArguments_ReturnsWithAllPossibleCalculationConfigurations()
+        public void GetAssessmentSectionWithAllCalculationConfigurations_DefaultComposition_ReturnsWithAllPossibleCalculationConfigurations()
         {
             // Call
             AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations();
@@ -89,7 +89,7 @@
         }
 
         [Test]
-        public void GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput_NoArguments_ReturnWithOnlyCalculationOutputsAndComposition()
+        public void GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput_DefaultComposition_ReturnWithOnlyCalculationOutputsAndComposition()
         {
             // Call 
             AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput();
@@ -121,7 +121,7 @@
         }
 
         [Test]
-        public void GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput_NoArguments_ReturnWithOnlyHydraulicBoundaryLocationAndDuneLocationOutputsAndComposition()
+        public void GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput_DefaultComposition_ReturnWithOnlyHydraulicBoundaryLocationAndDuneLocationOutputsAndComposition()
         {
             // Call 
             AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput();
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs
===================================================================
diff -u -r1f0cd3fafaa7340a446612870810629587474302 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs	(.../DataImportHelper.cs)	(revision 1f0cd3fafaa7340a446612870810629587474302)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs	(.../DataImportHelper.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -91,7 +91,7 @@
         /// <para>This will import 283 failure mechanism sections.</para>
         /// <para>Imports using <see cref="FileImportActivity"/>.</para>
         /// </remarks>
-        /// <seealso cref="ImportFailureMechanismSections(AssessmentSection, IEnumerable{IFailureMechanism})"/>
+        /// <seealso cref="ImportFailureMechanismSections(AssessmentSection, System.Collections.Generic.IEnumerable{Ringtoets.Common.Data.FailureMechanism.IFailureMechanism})"/>
         public static void ImportFailureMechanismSections(AssessmentSection assessmentSection, IFailureMechanism failureMechanism)
         {
             using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(typeof(DataImportHelper).Assembly,
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs
===================================================================
diff -u -r1f0cd3fafaa7340a446612870810629587474302 -r43ad5cd168824e7ba3b7b772e94b570d12a0597e
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 1f0cd3fafaa7340a446612870810629587474302)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e)
@@ -52,24 +52,14 @@
     public static class TestDataGenerator
     {
         /// <summary>
-        /// Gets a fully configured <see cref="AssessmentSection"/> with all possible configurations for the 
-        /// parent and nested calculations of the failure mechanisms.
-        /// </summary>
-        /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible configuration of 
-        /// the parent and nested calculations inside the failure mechanisms.</returns>
-        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurations()
-        {
-            return GetAssessmentSectionWithAllCalculationConfigurations(AssessmentSectionComposition.Dike);
-        }
-
-        /// <summary>
         /// Gets a fully configured <see cref="AssessmentSection"/> with a desired <see cref="AssessmentSectionComposition"/>
         /// and with all possible configurations for the parent and nested calculations of the failure mechanisms.
         /// </summary>
         /// <param name="composition">The desired <see cref="AssessmentSectionComposition"/> to initialize the <see cref="AssessmentSection"/> with.</param>
         /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible configurations of 
         /// the parent and nested calculation inside the failure mechanisms.</returns>
-        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurations(AssessmentSectionComposition composition)
+        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurations(
+            AssessmentSectionComposition composition = AssessmentSectionComposition.Dike)
         {
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
             {
@@ -112,19 +102,6 @@
         }
 
         /// <summary>
-        /// Gets a fully configured <see cref="AssessmentSection"/> with all possible configurations of the parent 
-        /// and nested calculations, but without the output of the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/>, 
-        /// and <see cref="DuneLocation"/>.
-        /// </summary>
-        /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible calculation configurations of 
-        /// the parent and nested calculations inside the failure mechanisms, but without the output of the 
-        /// <see cref="HydraulicBoundaryLocation"/> and the <see cref="DuneLocation"/>.</returns>
-        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput()
-        {
-            return GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput(AssessmentSectionComposition.Dike);
-        }
-
-        /// <summary>
         /// Gets a fully configured <see cref="AssessmentSection"/> with a desired <see cref="AssessmentSectionComposition"/> and 
         /// possible configurations of the parent and nested calculations, but without the output of the 
         /// <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>, <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/> 
@@ -134,7 +111,8 @@
         /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible calculation configurations of the parent and 
         /// nested calculations inside the failure mechanisms, but without the output of the <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>
         /// , <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/> and <see cref="DuneLocation.Output"/>.</returns>
-        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput(AssessmentSectionComposition composition)
+        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput(
+            AssessmentSectionComposition composition = AssessmentSectionComposition.Dike)
         {
             AssessmentSection assessmentSection = GetAssessmentSectionWithAllCalculationConfigurations(composition);
             RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, assessmentSection);
@@ -143,24 +121,14 @@
         }
 
         /// <summary>
-        /// Gets a fully configured <see cref="AssessmentSection"/> with all possible configurations of the 
-        /// parent and nested calculations, but without any calculation output of the failure mechanism.
-        /// </summary>
-        /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible configurations of the parent and nested calculations
-        /// of the failure mechanisms, but without any calculation outputs.</returns>
-        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput()
-        {
-            return GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput(AssessmentSectionComposition.Dike);
-        }
-
-        /// <summary>
         /// Gets a fully configured <see cref="AssessmentSection"/> with a desired <see cref="AssessmentSectionComposition"/> and 
         /// possible configurations of the parent and nested calculations, but without any calculation output of the failure mechanisms.
         /// </summary>
         /// <param name="composition">The desired <see cref="AssessmentSectionComposition"/> to initialize the <see cref="AssessmentSection"/> with.</param>
         /// <returns>A fully configured <see cref="AssessmentSection"/> with all possible configurations of the parent and nested calculations 
         /// of the failure mechanisms, but without any calculation output.</returns>
-        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput(AssessmentSectionComposition composition)
+        public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput(
+            AssessmentSectionComposition composition = AssessmentSectionComposition.Dike)
         {
             AssessmentSection assessmentSection = GetAssessmentSectionWithAllCalculationConfigurations(composition);
             RingtoetsDataSynchronizationService.ClearFailureMechanismCalculationOutputs(assessmentSection);