Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r733f6586289fc6b2d40073062b0ad5aa653110cb
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs	(.../AssessmentSectionHelper.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs	(.../AssessmentSectionHelper.cs)	(revision 733f6586289fc6b2d40073062b0ad5aa653110cb)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Linq;
+using Core.Common.Base.Data;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Contribution;
@@ -34,54 +35,33 @@
     public static class AssessmentSectionHelper
     {
         /// <summary>
-        /// Creates a stub of <see cref="IAssessmentSection"/> without <see cref="HydraulicBoundaryDatabase"/> 
-        /// or <see cref="IFailureMechanism"/> set.
+        /// Creates a stub of <see cref="IAssessmentSection"/> with a <see cref="HydraulicBoundaryDatabase"/> that is not linked.
         /// </summary>
         /// <param name="mockRepository">The mock repository to create the stub with.</param>
         /// <returns>A stubbed <see cref="IAssessmentSection"/>.</returns>
-        public static IAssessmentSection CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(MockRepository mockRepository)
+        public static IAssessmentSection CreateAssessmentSectionStub(MockRepository mockRepository)
         {
-            return CreateAssessmentSectionStub(null, mockRepository, false, null);
-        }
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
 
-        /// <summary>
-        /// Creates a stub of <see cref="IAssessmentSection"/> without the <see cref="HydraulicBoundaryDatabase"/> set.
-        /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to set the contribution for.</param>
-        /// <param name="mockRepository">The mock repository to create the stub with.</param>
-        /// <returns>A stubbed <see cref="IAssessmentSection"/>.</returns>
-        public static IAssessmentSection CreateAssessmentSectionStubWithoutBoundaryDatabase(IFailureMechanism failureMechanism,
-                                                                                            MockRepository mockRepository)
-        {
-            return CreateAssessmentSectionStub(failureMechanism, mockRepository, false, null);
+            return assessmentSection;
         }
 
         /// <summary>
-        /// Creates a stub of <see cref="IAssessmentSection"/> with the <see cref="HydraulicBoundaryDatabase"/> set.
+        /// Creates a stub of <see cref="IAssessmentSection"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to set the contribution for.</param>
         /// <param name="mockRepository">The mock repository to create the stub with.</param>
-        /// <param name="filePath">The file path to the hydraulic boundary database.</param>
+        /// <param name="filePath">The file path to the hydraulic boundary database (optional).</param>
         /// <returns>A stubbed <see cref="IAssessmentSection"/>.</returns>
+        /// <remarks>Whether <paramref name="filePath"/> is provided or not, a dummy location with id 1300001 is added to the
+        /// hydraulic boundary database.</remarks>
         public static IAssessmentSection CreateAssessmentSectionStub(IFailureMechanism failureMechanism,
                                                                      MockRepository mockRepository,
                                                                      string filePath = null)
         {
-            return CreateAssessmentSectionStub(failureMechanism, mockRepository, true, filePath);
-        }
+            IFailureMechanism[] failureMechanisms = GetFailureMechanisms(failureMechanism);
 
-        private static IAssessmentSection CreateAssessmentSectionStub(IFailureMechanism failureMechanism,
-                                                                      MockRepository mockRepository,
-                                                                      bool addBoundaryDatabase,
-                                                                      string filePath)
-        {
-            IFailureMechanism[] failureMechanisms = failureMechanism == null
-                                                        ? Enumerable.Empty<IFailureMechanism>().ToArray()
-                                                        : new[]
-                                                        {
-                                                            failureMechanism
-                                                        };
-
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.Id).Return("21");
             assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(
@@ -90,17 +70,34 @@
                                                                                    0.1,
                                                                                    1.0 / 30000));
             assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(failureMechanisms);
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(GetHydraulicBoundaryDatabase(filePath));
 
-            if (addBoundaryDatabase)
-            {
-                assessmentSection.HydraulicBoundaryDatabase = GetHydraulicBoundaryDatabase(filePath);
-            }
+            assessmentSection.Replay();
 
             return assessmentSection;
         }
 
-        private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase(string filePath = null)
+        /// <summary>
+        /// Gets a normative assessment level.
+        /// </summary>
+        /// <returns>The normative assessment level.</returns>
+        public static RoundedDouble GetTestNormativeAssessmentLevel()
         {
+            return (RoundedDouble) 1.1;
+        }
+
+        private static IFailureMechanism[] GetFailureMechanisms(IFailureMechanism failureMechanism)
+        {
+            return failureMechanism == null
+                       ? Enumerable.Empty<IFailureMechanism>().ToArray()
+                       : new[]
+                       {
+                           failureMechanism
+                       };
+        }
+
+        private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase(string filePath)
+        {
             return new HydraulicBoundaryDatabase
             {
                 FilePath = filePath,