Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r156b46b92a4beaf22dc59e628db19be5536468fc -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 156b46b92a4beaf22dc59e628db19be5536468fc)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -60,7 +60,7 @@
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     FilePath = Path.Combine(testDataPath, "notexisting.sqlite")
                 }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r2a5b882dc9e52231eea22d40d686b075aa72a1aa -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 2a5b882dc9e52231eea22d40d686b075aa72a1aa)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -58,10 +58,7 @@
         public void Run_CalculationWithInvalidHydraulicBoundaryDatabaseFilePath_DoesNotPerformCalculationAndLogsError()
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
-            };
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
 
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
@@ -115,7 +112,7 @@
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     CanUsePreprocessor = true,
                     UsePreprocessor = true,
@@ -523,7 +520,7 @@
             var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     FilePath = validFilePath,
                     Locations =
@@ -566,7 +563,7 @@
             var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     FilePath = validFilePath,
                     Locations =
@@ -612,7 +609,7 @@
             var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     FilePath = validFilePath,
                     Locations =
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -r883c7588d3e4220fc397df641d0cadf6d6befc23 -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs	(.../AssessmentSectionTest.cs)	(revision 883c7588d3e4220fc397df641d0cadf6d6befc23)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs	(.../AssessmentSectionTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -411,21 +411,6 @@
             Assert.AreEqual(double.NaN, assessmentSection.MacroStabilityInwards.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength);
         }
 
-        [Test]
-        public void HydraulicBoundaryDatabase_SetNewValue_GetNewValue()
-        {
-            // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-
-            // Call
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-
-            // Assert
-            Assert.AreSame(hydraulicBoundaryDatabase, assessmentSection.HydraulicBoundaryDatabase);
-        }
-
         private IFailureMechanism[] GetExpectedContributingFailureMechanisms(AssessmentSection section)
         {
             return new IFailureMechanism[]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs
===================================================================
diff -u -r8b059d0dc14b8dbc19f708e2782029a22ec0a1d2 -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextExportInfoTest.cs)	(revision 8b059d0dc14b8dbc19f708e2782029a22ec0a1d2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextExportInfoTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -60,12 +60,15 @@
         public void CreateFileExporter_Always_ReturnFileExporter()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 0, 0));
-
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
+                {
+                    Locations =
+                    {
+                        new HydraulicBoundaryLocation(1, "test", 0, 0)
+                    }
+                }
             };
             var context = new HydraulicBoundaryDatabaseContext(assessmentSection);
             const string filePath = "test";
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -53,10 +53,11 @@
         public void CreateInstance_Always_SetsHydraulicBoundaryDatabaseAsData()
         {
             // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
             mockRepository.ReplayAll();
 
             var context = new DesignWaterLevelLocationsContext(assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs	(.../WaveHeightLocationsContextPropertyInfoTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs	(.../WaveHeightLocationsContextPropertyInfoTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -53,10 +53,11 @@
         public void CreateInstance_Always_SetsHydraulicBoundaryDatabaseAsData()
         {
             // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
             mockRepository.ReplayAll();
 
             var context = new WaveHeightLocationsContext(assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r5d822eca2d7467c9781a4a3a54d796ac4229e4a3 -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 5d822eca2d7467c9781a4a3a54d796ac4229e4a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -439,7 +439,7 @@
 
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
             assessmentSection.Stub(section => section.GetFailureMechanisms()).Return(new IFailureMechanism[]
             {
                 grassCoverErosionOutwardsFailureMechanism,
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r5d822eca2d7467c9781a4a3a54d796ac4229e4a3 -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 5d822eca2d7467c9781a4a3a54d796ac4229e4a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64)
@@ -78,7 +78,7 @@
             var assessmentSection = new AssessmentSection(composition)
             {
                 ReferenceLine = new ReferenceLine(),
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     Locations =
                     {