Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r175232fafee6edb906c13c934f114641904785c4 -r1c5347028d26bd584420a222912de89fb55b72c2
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 175232fafee6edb906c13c934f114641904785c4)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 1c5347028d26bd584420a222912de89fb55b72c2)
@@ -37,7 +37,6 @@
 using Riskeer.Common.Service;
 using Riskeer.Common.Service.TestUtil;
 using Riskeer.DuneErosion.Data;
-using Riskeer.DuneErosion.Data.TestUtil;
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HeightStructures.Data.TestUtil;
Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -rca5825018a4c61a51239c9e1c2882e264892d07e -r1c5347028d26bd584420a222912de89fb55b72c2
--- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision ca5825018a4c61a51239c9e1c2882e264892d07e)
+++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 1c5347028d26bd584420a222912de89fb55b72c2)
@@ -55,7 +55,7 @@
         {
             // Call
             void Call() => WaveConditionsCalculationServiceBase.Validate(null, GetValidAssessmentLevel(),
-                                                                         GetValidHydraulicBoundaryData());
+                                                                         GetValidHydraulicBoundaryData(new TestHydraulicBoundaryLocation()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -168,7 +168,7 @@
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(),
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(new TestHydraulicBoundaryLocation()));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -189,14 +189,16 @@
             // Setup
             var isValid = false;
 
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
+
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation
             };
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, RoundedDouble.NaN,
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -221,9 +223,11 @@
             // Setup
             var isValid = false;
 
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(),
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 Orientation = (RoundedDouble) 0,
                 LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetments,
                 UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetments,
@@ -234,7 +238,7 @@
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, (RoundedDouble) assessmentLevel,
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -264,7 +268,7 @@
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(),
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(input.HydraulicBoundaryLocation));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -294,7 +298,7 @@
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(),
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(input.HydraulicBoundaryLocation));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -337,7 +341,7 @@
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(),
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(input.HydraulicBoundaryLocation));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -362,7 +366,7 @@
 
             // Call
             void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(),
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(input.HydraulicBoundaryLocation));
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
@@ -389,7 +393,7 @@
             // Call
             void Call() => new TestWaveConditionsCalculationService().PublicCalculate(a, b, c, targetProbability, null,
                                                                                       GetValidAssessmentLevel(),
-                                                                                      GetValidHydraulicBoundaryData());
+                                                                                      GetValidHydraulicBoundaryData(new TestHydraulicBoundaryLocation()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -425,9 +429,10 @@
             var b = (RoundedDouble) 0.8;
             var c = (RoundedDouble) 0.4;
             const double targetProbability = 0.2;
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(),
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(true),
                 UpperBoundaryRevetment = (RoundedDouble) 4,
                 LowerBoundaryRevetment = (RoundedDouble) 3,
@@ -459,7 +464,7 @@
                                                                            targetProbability,
                                                                            input,
                                                                            waterLevel,
-                                                                           GetValidHydraulicBoundaryData());
+                                                                           GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
 
                 // Assert
                 for (var i = 0; i < nrOfCalculators; i++)
@@ -484,9 +489,10 @@
             var b = (RoundedDouble) 0.8;
             var c = (RoundedDouble) 0.4;
             const double targetProbability = 0.2;
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(),
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(true),
                 UpperBoundaryRevetment = (RoundedDouble) 4,
                 LowerBoundaryRevetment = (RoundedDouble) 3,
@@ -523,7 +529,7 @@
                                                                            targetProbability,
                                                                            input,
                                                                            waterLevel,
-                                                                           GetValidHydraulicBoundaryData());
+                                                                           GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
 
                 // Assert
                 for (var i = 0; i < nrOfCalculators; i++)
@@ -607,9 +613,11 @@
             var waterLevelUpperBoundaryRevetment = new RoundedDouble(2, 4.00);
             var waterLevelLowerBoundaryRevetment = new RoundedDouble(2, 3.00);
 
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(),
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(),
                 UpperBoundaryRevetment = waterLevelUpperBoundaryRevetment,
                 LowerBoundaryRevetment = waterLevelLowerBoundaryRevetment
@@ -647,7 +655,7 @@
                     try
                     {
                         new TestWaveConditionsCalculationService().PublicCalculate(a, b, c, targetProbability, input, waterLevel,
-                                                                                   GetValidHydraulicBoundaryData());
+                                                                                   GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
                     }
                     catch (HydraRingCalculationException e)
                     {
@@ -721,9 +729,10 @@
             var b = (RoundedDouble) 0.8;
             var c = (RoundedDouble) 0.4;
             const double targetProbability = 0.2;
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(),
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(),
                 UpperBoundaryRevetment = waterLevelUpperBoundary,
                 LowerBoundaryRevetment = waterLevelLowerBoundary
@@ -734,7 +743,8 @@
                 var service = new TestWaveConditionsCalculationService();
 
                 // Call
-                void Call() => service.PublicCalculate(a, b, c, targetProbability, input, waterLevel, GetValidHydraulicBoundaryData());
+                void Call() => service.PublicCalculate(a, b, c, targetProbability, input, waterLevel,
+                                                       GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
 
                 // Assert
                 TestHelper.AssertLogMessages(Call, messages =>
@@ -778,9 +788,10 @@
             var b = (RoundedDouble) 0.8;
             var c = (RoundedDouble) 0.4;
             const double targetProbability = 0.2;
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var input = new WaveConditionsInput
             {
-                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(),
+                HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 ForeshoreProfile = new TestForeshoreProfile(),
                 UpperBoundaryRevetment = waterLevel,
                 LowerBoundaryRevetment = (RoundedDouble) 3
@@ -805,7 +816,7 @@
                                         targetProbability,
                                         input,
                                         waterLevel,
-                                        GetValidHydraulicBoundaryData());
+                                        GetValidHydraulicBoundaryData(hydraulicBoundaryLocation));
 
                 // Assert
                 Assert.IsTrue(calculator.IsCanceled);
@@ -832,14 +843,25 @@
             return input;
         }
 
-        private static HydraulicBoundaryData GetValidHydraulicBoundaryData()
+        private static HydraulicBoundaryData GetValidHydraulicBoundaryData(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             return new HydraulicBoundaryData
             {
                 FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
+                },
+                HydraulicBoundaryDatabases =
+                {
+                    new HydraulicBoundaryDatabase
+                    {
+                        FilePath = validHrdFilePath,
+                        Locations =
+                        {
+                            hydraulicBoundaryLocation
+                        }
+                    }
                 }
             };
         }