Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs
===================================================================
diff -u -r61569f97d5456bf2b2b30c6e45476617f89667ed -r45ad7ae7df62bba86730e6f0c7b019740adac9bd
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 61569f97d5456bf2b2b30c6e45476617f89667ed)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 45ad7ae7df62bba86730e6f0c7b019740adac9bd)
@@ -258,6 +258,11 @@
             // Setup
             var location1 = new TestHydraulicBoundaryLocation();
             var location2 = new TestHydraulicBoundaryLocation();
+            var location3 = new TestHydraulicBoundaryLocation();
+            var location4 = new TestHydraulicBoundaryLocation();
+
+            var hydraulicBoundaryDatabaseFileName1 = "HRD1";
+            var hydraulicBoundaryDatabaseFileName2 = "HRD2";
             var assessmentSection = new AssessmentSectionStub
             {
                 HydraulicBoundaryData =
@@ -266,18 +271,20 @@
                     {
                         new HydraulicBoundaryDatabase
                         {
-                            FilePath = "Just/A/HRD1",
+                            FilePath = $"Just/A/{hydraulicBoundaryDatabaseFileName1}.sqlite",
                             Locations =
                             {
-                                location1
+                                location1,
+                                location2
                             }
                         },
                         new HydraulicBoundaryDatabase
                         {
-                            FilePath = "Just/A/HRD2",
+                            FilePath = $"Just/A/{hydraulicBoundaryDatabaseFileName2}.sqlite",
                             Locations =
                             {
-                                location2
+                                location3,
+                                location4
                             }
                         }
                     }
@@ -291,10 +298,16 @@
             CollectionAssert.AreEquivalent(new Dictionary<HydraulicBoundaryLocation, string>
             {
                 {
-                    location1, "HRD1"
+                    location1, hydraulicBoundaryDatabaseFileName1
                 },
                 {
-                    location2, "HRD2"
+                    location2, hydraulicBoundaryDatabaseFileName1
+                },
+                {
+                    location3, hydraulicBoundaryDatabaseFileName2
+                },
+                {
+                    location4, hydraulicBoundaryDatabaseFileName2
                 }
             }, lookup);
         }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -rf7f3a26542255869e4604671b521ff695493a7b5 -r45ad7ae7df62bba86730e6f0c7b019740adac9bd
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision f7f3a26542255869e4604671b521ff695493a7b5)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 45ad7ae7df62bba86730e6f0c7b019740adac9bd)
@@ -500,7 +500,7 @@
                 return ShowFullyConfiguredDesignWaterLevelCalculationsView(calculations, form);
             }
 
-            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(HydraulicBoundaryCalculationsView view)
+            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView()
             {
                 return calculations;
             }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs
===================================================================
diff -u -re68cc1771406b97ed942838b3bf28d0f1ab3f3c5 -r45ad7ae7df62bba86730e6f0c7b019740adac9bd
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs	(.../HydraulicBoundaryLocationCalculationRowTest.cs)	(revision e68cc1771406b97ed942838b3bf28d0f1ab3f3c5)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs	(.../HydraulicBoundaryLocationCalculationRowTest.cs)	(revision 45ad7ae7df62bba86730e6f0c7b019740adac9bd)
@@ -77,7 +77,7 @@
 
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
-            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, "HRD FileName");
+            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, string.Empty);
 
             row.CalculatableObject.Attach(observer);
 
@@ -97,7 +97,7 @@
             // Setup
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
-            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, "HRD FileName");
+            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, string.Empty);
 
             var random = new Random(432);
             var output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -rf7f3a26542255869e4604671b521ff695493a7b5 -r45ad7ae7df62bba86730e6f0c7b019740adac9bd
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision f7f3a26542255869e4604671b521ff695493a7b5)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 45ad7ae7df62bba86730e6f0c7b019740adac9bd)
@@ -500,7 +500,7 @@
                 return ShowFullyConfiguredWaveHeightCalculationsView(calculations, form);
             }
 
-            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(HydraulicBoundaryCalculationsView view)
+            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView()
             {
                 return calculations;
             }
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/HydraulicBoundaryCalculationsViewSynchronizationTester.cs
===================================================================
diff -u -r7d699456f50b25493e9a9f25667470efcc30b1b7 -r45ad7ae7df62bba86730e6f0c7b019740adac9bd
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/HydraulicBoundaryCalculationsViewSynchronizationTester.cs	(.../HydraulicBoundaryCalculationsViewSynchronizationTester.cs)	(revision 7d699456f50b25493e9a9f25667470efcc30b1b7)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/HydraulicBoundaryCalculationsViewSynchronizationTester.cs	(.../HydraulicBoundaryCalculationsViewSynchronizationTester.cs)	(revision 45ad7ae7df62bba86730e6f0c7b019740adac9bd)
@@ -83,15 +83,14 @@
         protected abstract HydraulicBoundaryCalculationsView ShowFullyConfiguredCalculationsView(Form form);
 
         /// <summary>
-        /// Method for getting the calculations in <paramref name="view"/>.
+        /// Method for getting the calculations in the view.
         /// </summary>
-        /// <param name="view">The view to get the calculations from.</param>
         /// <returns>An <see cref="ObservableList{T}"/> of calculations.</returns>
-        protected abstract ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(HydraulicBoundaryCalculationsView view);
+        protected abstract ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView();
 
         private void ReplaceCalculationsAndNotifyObservers(HydraulicBoundaryCalculationsView view)
         {
-            ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView(view);
+            ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0);
             IAssessmentSection assessmentSection = view.AssessmentSection;
@@ -104,7 +103,7 @@
 
         private void ClearCalculationOutputAndNotifyObservers(HydraulicBoundaryCalculationsView view)
         {
-            ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView(view);
+            ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView();
 
             calculations.ForEach(calculation =>
             {
@@ -115,7 +114,7 @@
 
         private void SetCalculationOutputAndNotifyObservers(HydraulicBoundaryCalculationsView view)
         {
-            ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView(view);
+            ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView();
 
             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = calculations.First();
             hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint());