Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs
===================================================================
diff -u -r44cf5bc0f292171637b0c91b74005effe4d2798c -reee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs	(.../IAssessmentSection.cs)	(revision 44cf5bc0f292171637b0c91b74005effe4d2798c)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs	(.../IAssessmentSection.cs)	(revision eee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Core.Common.Base;
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs
===================================================================
diff -u -r1f55c58a999fdcfd9010d446da6c3be998b154c8 -reee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs	(.../AssessmentSectionHelperTest.cs)	(revision 1f55c58a999fdcfd9010d446da6c3be998b154c8)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs	(.../AssessmentSectionHelperTest.cs)	(revision eee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2)
@@ -114,7 +114,7 @@
             // Assert
             Assert.IsNotNull(assessmentSection);
             Assert.AreEqual("21", assessmentSection.Id);
-            Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase);
+            Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsCoupled());
             CollectionAssert.AreEqual(new[]
             {
                 failureMechanism
@@ -139,7 +139,7 @@
             // Assert
             Assert.IsNotNull(assessmentSection);
             Assert.AreEqual("21", assessmentSection.Id);
-            Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase);
+            Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsCoupled());
             CollectionAssert.IsEmpty(assessmentSection.GetFailureMechanisms());
 
             FailureMechanismContribution contribution = assessmentSection.FailureMechanismContribution;
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs
===================================================================
diff -u -re8cb16c61e91db7fe396fd557c39bfb80a7c15c5 -reee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs	(.../AssessmentSectionHelper.cs)	(revision e8cb16c61e91db7fe396fd557c39bfb80a7c15c5)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs	(.../AssessmentSectionHelper.cs)	(revision eee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2)
@@ -104,6 +104,10 @@
 
                 assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
             }
+            else
+            {
+                assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
+            }
 
             return assessmentSection;
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs
===================================================================
diff -u -re8cb16c61e91db7fe396fd557c39bfb80a7c15c5 -reee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs	(.../StructuresCalculationServiceBaseTest.cs)	(revision e8cb16c61e91db7fe396fd557c39bfb80a7c15c5)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs	(.../StructuresCalculationServiceBaseTest.cs)	(revision eee4fec4eafb113cdb3cd7fa6bd38e8f4ad968b2)
@@ -241,8 +241,7 @@
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(
-                failureMechanism, mocks);
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
+                failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
 
             var calculation = new TestStructuresCalculation
@@ -280,8 +279,7 @@
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(
-                failureMechanism, mocks);
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
+                failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
 
             var calculation = new TestStructuresCalculation
@@ -321,8 +319,7 @@
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(
-                failureMechanism, mocks);
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
+                failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
 
             var calculation = new TestStructuresCalculation