Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -rf1948d65dac5a5734cc13a632e9452cf7c0b78b8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs	(.../FailureMechanismContributionPropertiesIntegrationTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs	(.../FailureMechanismContributionPropertiesIntegrationTest.cs)	(revision f1948d65dac5a5734cc13a632e9452cf7c0b78b8)
@@ -61,19 +61,18 @@
             const int numberOfCalculations = 3;
 
             TestHydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                Locations =
+                HydraulicBoundaryDatabase =
                 {
-                    hydraulicBoundaryLocation
+                    Locations =
+                    {
+                        hydraulicBoundaryLocation
+                    }
                 }
             };
 
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-            };
-
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             var pipingCalculation = new PipingCalculation(new GeneralPipingInput())
             {
@@ -127,7 +126,7 @@
             mockRepository.ReplayAll();
 
             failureMechanismContribution.Attach(failureMechanismContributionObserver);
-            hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
+            assessmentSection.HydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
 
             emptyPipingCalculation.Attach(emptyPipingCalculationObserver);
             emptyGrassCoverErosionInwardsCalculation.Attach(emptyGrassCoverErosionInwardsCalculationObserver);
@@ -178,19 +177,18 @@
         {
             // Setup
             TestHydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                Locations =
+                HydraulicBoundaryDatabase =
                 {
-                    hydraulicBoundaryLocation
+                    Locations =
+                    {
+                        hydraulicBoundaryLocation
+                    }
                 }
             };
 
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-            };
-
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             var pipingCalculation = new PipingCalculation(new GeneralPipingInput())
             {
@@ -236,7 +234,7 @@
             mockRepository.ReplayAll();
 
             failureMechanismContribution.Attach(failureMechanismContributionObserver);
-            hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
+            assessmentSection.HydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
 
             emptyPipingCalculation.Attach(emptyPipingCalculationObserver);
             emptyGrassCoverErosionInwardsCalculation.Attach(emptyGrassCoverErosionInwardsCalculationObserver);
@@ -290,19 +288,17 @@
         private void SetPropertyAndVerifyNotificationsAndOutputForHydraulicBoundarySetAndCalculationsNoOutput(Action<FailureMechanismContributionProperties> setPropertyAction)
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                Locations =
+                HydraulicBoundaryDatabase =
                 {
-                    TestHydraulicBoundaryLocation.CreateFullyCalculated()
+                    Locations =
+                    {
+                        TestHydraulicBoundaryLocation.CreateFullyCalculated()
+                    }
                 }
             };
 
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-            };
-
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             var emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
             var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
@@ -324,7 +320,7 @@
             mockRepository.ReplayAll();
 
             failureMechanismContribution.Attach(observer);
-            hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
+            assessmentSection.HydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
 
             emptyPipingCalculation.Attach(calculationObserver);
             emptyGrassCoverErosionInwardsCalculation.Attach(calculationObserver);
@@ -361,12 +357,15 @@
             // Setup
             const int numberOfCalculations = 3;
 
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            hydraulicBoundaryDatabase.Locations.Add(new TestHydraulicBoundaryLocation());
-
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
+                {
+                    Locations =
+                    {
+                        new TestHydraulicBoundaryLocation()
+                    }
+                }
             };
 
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
@@ -415,7 +414,7 @@
             mockRepository.ReplayAll();
 
             failureMechanismContribution.Attach(observer);
-            hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
+            assessmentSection.HydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
 
             emptyPipingCalculation.Attach(emptyPipingCalculationObserver);
             emptyGrassCoverErosionInwardsCalculation.Attach(emptyGrassCoverErosionInwardsCalculationObserver);
@@ -544,12 +543,15 @@
         private void SetPropertyAndVerifyNotificationsAndOutputForHydraulicBoundaryLocationNoOutputAndNoCalculationsWithOutput(Action<FailureMechanismContributionProperties> setPropertyAction)
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            hydraulicBoundaryDatabase.Locations.Add(new TestHydraulicBoundaryLocation());
-
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
+                {
+                    Locations =
+                    {
+                        new TestHydraulicBoundaryLocation()
+                    }
+                }
             };
 
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
@@ -575,7 +577,7 @@
             emptyPipingCalculation.Attach(calculationObserver);
             emptyGrassCoverErosionInwardsCalculation.Attach(calculationObserver);
             emptyHeightStructuresCalculation.Attach(calculationObserver);
-            hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
+            assessmentSection.HydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
 
             var properties = new FailureMechanismContributionProperties(
                 failureMechanismContribution,
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -rc596452c5be18e76aea44c66f5b947e8088eacff -rf1948d65dac5a5734cc13a632e9452cf7c0b78b8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision c596452c5be18e76aea44c66f5b947e8088eacff)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision f1948d65dac5a5734cc13a632e9452cf7c0b78b8)
@@ -26,7 +26,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
@@ -58,24 +57,20 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-
             const string filePath = @"C:\file.sqlite";
             const bool usePreprocessor = true;
             const string preprocessorDirectory = @"C:\preprocessor";
-            var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection)
+
+            var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                WrappedData =
+                HydraulicBoundaryDatabase =
                 {
-                    HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-                    {
-                        FilePath = filePath,
-                        CanUsePreprocessor = true,
-                        UsePreprocessor = usePreprocessor,
-                        PreprocessorDirectory = preprocessorDirectory
-                    }
+                    FilePath = filePath,
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = usePreprocessor,
+                    PreprocessorDirectory = preprocessorDirectory
                 }
-            };
+            });
 
             // Call
             var properties = new HydraulicBoundaryDatabaseProperties(hydraulicBoundaryDatabaseContext);
@@ -93,18 +88,15 @@
         public void Constructor_CanUsePreprocessorTrue_PropertiesHaveExpectedAttributesValues(bool usePreprocessor)
         {
             // Setup
-            var context = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike))
+            var context = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                WrappedData =
+                HydraulicBoundaryDatabase =
                 {
-                    HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-                    {
-                        CanUsePreprocessor = true,
-                        UsePreprocessor = usePreprocessor,
-                        PreprocessorDirectory = "Preprocessor"
-                    }
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = usePreprocessor,
+                    PreprocessorDirectory = "Preprocessor"
                 }
-            };
+            });
 
             // Call
             var properties = new HydraulicBoundaryDatabaseProperties(context);
@@ -138,13 +130,7 @@
         public void Constructor_CanUsePreprocessorFalse_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var context = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike))
-            {
-                WrappedData =
-                {
-                    HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
-                }
-            };
+            var context = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike));
 
             // Call
             var properties = new HydraulicBoundaryDatabaseProperties(context);
@@ -193,20 +179,16 @@
 
             mocks.ReplayAll();
 
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = !usePreprocessor,
-                PreprocessorDirectory = "Preprocessor"
-            };
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var context = new HydraulicBoundaryDatabaseContext(assessmentSection)
-            {
-                WrappedData =
+                HydraulicBoundaryDatabase =
                 {
-                    HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = !usePreprocessor,
+                    PreprocessorDirectory = "Preprocessor"
                 }
             };
+            var context = new HydraulicBoundaryDatabaseContext(assessmentSection);
             var properties = new HydraulicBoundaryDatabaseProperties(context);
 
             assessmentSection.Attach(observer);
@@ -215,7 +197,7 @@
             properties.UsePreprocessor = usePreprocessor;
 
             // Assert
-            Assert.AreEqual(usePreprocessor, hydraulicBoundaryDatabase.UsePreprocessor);
+            Assert.AreEqual(usePreprocessor, assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor);
             mocks.VerifyAll();
         }
 
@@ -224,26 +206,23 @@
         {
             // Setup
             const string newPreprocessorDirectory = @"C:/path";
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = "Preprocessor"
-            };
-            var context = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike))
-            {
-                WrappedData =
+                HydraulicBoundaryDatabase =
                 {
-                    HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = "Preprocessor"
                 }
             };
+            var context = new HydraulicBoundaryDatabaseContext(assessmentSection);
             var properties = new HydraulicBoundaryDatabaseProperties(context);
 
             // Call
             properties.PreprocessorDirectory = newPreprocessorDirectory;
 
             // Assert
-            Assert.AreEqual(newPreprocessorDirectory, hydraulicBoundaryDatabase.PreprocessorDirectory);
+            Assert.AreEqual(newPreprocessorDirectory, assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory);
         }
 
         [Test]
@@ -252,19 +231,16 @@
             [Values(true, false)] bool usePreprocessor)
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
 
             if (canUsePreprocessor)
             {
-                hydraulicBoundaryDatabase.CanUsePreprocessor = true;
-                hydraulicBoundaryDatabase.UsePreprocessor = usePreprocessor;
-                hydraulicBoundaryDatabase.PreprocessorDirectory = "Preprocessor";
+                assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
+                assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = usePreprocessor;
+                assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "Preprocessor";
             }
 
-            var context = new HydraulicBoundaryDatabaseContext(new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-            });
+            var context = new HydraulicBoundaryDatabaseContext(assessmentSection);
 
             // Call
             var properties = new HydraulicBoundaryDatabaseProperties(context);