Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ImportInfos/HydraulicBoundaryDatabaseContextImportInfoTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r95c18b9ebff81ae5beac59c63e8608dec1e43ca2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ImportInfos/HydraulicBoundaryDatabaseContextImportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextImportInfoTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ImportInfos/HydraulicBoundaryDatabaseContextImportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextImportInfoTest.cs)	(revision 95c18b9ebff81ae5beac59c63e8608dec1e43ca2)
@@ -119,7 +119,7 @@
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
             mocks.ReplayAll();
 
-            var importTarget = new HydraulicBoundaryDatabaseContext(new HydraulicBoundaryDatabase(), new AssessmentSection(AssessmentSectionComposition.Dike));
+            var importTarget = new HydraulicBoundaryDatabaseContext(new HydraulicBoundaryData(), new AssessmentSection(AssessmentSectionComposition.Dike));
 
             // Call
             IFileImporter importer = importInfo.CreateFileImporter(importTarget, "");
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb00024dc0f9782ee59162ca618c963c3ec19e98c -r95c18b9ebff81ae5beac59c63e8608dec1e43ca2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision b00024dc0f9782ee59162ca618c963c3ec19e98c)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 95c18b9ebff81ae5beac59c63e8608dec1e43ca2)
@@ -130,9 +130,14 @@
             const double signalFloodingProbability = 0.002;
             const double maximumAllowableFloodingProbability = 0.005;
 
-            var assessmentSection = new AssessmentSectionStub();
-            assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability;
-            assessmentSection.FailureMechanismContribution.SignalFloodingProbability = signalFloodingProbability;
+            var assessmentSection = new AssessmentSectionStub
+            {
+                FailureMechanismContribution =
+                {
+                    MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability,
+                    SignalFloodingProbability = signalFloodingProbability
+                }
+            };
 
             var locations = new ObservableList<HydraulicBoundaryLocation>();
             var calculationsGroupContext = new WaterLevelCalculationsForNormTargetProbabilitiesGroupContext(locations, assessmentSection);
@@ -343,9 +348,7 @@
         {
             // Setup
             IAssessmentSection assessmentSection = new AssessmentSectionStub();
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO,
-                                                                                                           nameof(HydraulicBoundaryDatabase)),
-                                                                                "complete.sqlite");
+            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)), "complete.sqlite");
             HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
 
             var nodeData = new WaterLevelCalculationsForNormTargetProbabilitiesGroupContext(new ObservableList<HydraulicBoundaryLocation>(),
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb00024dc0f9782ee59162ca618c963c3ec19e98c -r95c18b9ebff81ae5beac59c63e8608dec1e43ca2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision b00024dc0f9782ee59162ca618c963c3ec19e98c)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 95c18b9ebff81ae5beac59c63e8608dec1e43ca2)
@@ -437,9 +437,7 @@
         {
             // Setup
             IAssessmentSection assessmentSection = new AssessmentSectionStub();
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO,
-                                                                                                           nameof(HydraulicBoundaryDatabase)),
-                                                                                "complete.sqlite");
+            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)), "complete.sqlite");
             HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
 
             var calculationsForTargetProbabilities = new ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability>
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb00024dc0f9782ee59162ca618c963c3ec19e98c -r95c18b9ebff81ae5beac59c63e8608dec1e43ca2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision b00024dc0f9782ee59162ca618c963c3ec19e98c)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 95c18b9ebff81ae5beac59c63e8608dec1e43ca2)
@@ -437,9 +437,7 @@
         {
             // Setup
             IAssessmentSection assessmentSection = new AssessmentSectionStub();
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO,
-                                                                                                           nameof(HydraulicBoundaryDatabase)),
-                                                                                "complete.sqlite");
+            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)), "complete.sqlite");
             HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
 
             var calculationsForTargetProbabilities = new ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability>