Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -r1c5347028d26bd584420a222912de89fb55b72c2 -rf57f915fa5e8488bf4c853ff53c00da3c150bc2d
--- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 1c5347028d26bd584420a222912de89fb55b72c2)
+++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision f57f915fa5e8488bf4c853ff53c00da3c150bc2d)
@@ -77,47 +77,52 @@
         }
 
         [Test]
-        public void Validate_InvalidHydraulicBoundaryDatabaseFileLocation_ReturnsFalseAndLogsValidationError()
+        public void Validate_NoHydraulicBoundaryDatabase_LogsValidationMessageAndReturnFalse()
         {
             // Setup 
             var isValid = false;
-            string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite");
 
+            var waveConditionsInput = new WaveConditionsInput
+            {
+                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation()
+            };
+
             // Call
-            void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(),
+            void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(waveConditionsInput,
                                                                                    GetValidAssessmentLevel(),
-                                                                                   new HydraulicBoundaryData
-                                                                                   {
-                                                                                       FilePath = invalidFilePath
-                                                                                   });
+                                                                                   new HydraulicBoundaryData());
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. " +
-                                $"Fout bij het lezen van bestand '{invalidFilePath}': het bestand bestaat niet.", msgs[1]);
+                Assert.AreEqual("Er is geen hydraulische belastingendatabase geïmporteerd.", msgs[1]);
                 CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
             });
 
             Assert.IsFalse(isValid);
         }
 
         [Test]
-        public void Validate_ValidHydraulicBoundaryDatabaseWithoutSettings_LogsValidationMessageAndReturnFalse()
+        public void Validate_InvalidHydraulicBoundaryDatabase_ReturnsFalseAndLogsValidationError()
         {
             // Setup 
             var isValid = false;
-            string dbFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite");
+            string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite");
+            
+            var waveConditionsInput = new WaveConditionsInput
+            {
+                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation()
+            };
 
             // Call
-            void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(),
+            void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(waveConditionsInput,
                                                                                    GetValidAssessmentLevel(),
                                                                                    new HydraulicBoundaryData
                                                                                    {
-                                                                                       FilePath = dbFilePath
+                                                                                       FilePath = invalidFilePath
                                                                                    });
 
             // Assert
@@ -126,38 +131,48 @@
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. " +
-                                        "Fout bij het lezen van bestand", msgs[1]);
+                Assert.AreEqual("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. " +
+                                $"Fout bij het lezen van bestand '{invalidFilePath}': het bestand bestaat niet.", msgs[1]);
                 CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
             });
 
             Assert.IsFalse(isValid);
         }
 
         [Test]
-        public void Validate_WithoutImportedHydraulicBoundaryDatabase_LogsValidationMessageAndReturnFalse()
+        public void Validate_HydraulicBoundaryDatabaseWithoutSettings_LogsValidationMessageAndReturnFalse()
         {
             // Setup 
             var isValid = false;
+            string dbFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite");
 
+            var waveConditionsInput = new WaveConditionsInput
+            {
+                HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation()
+            };
+
             // Call
-            void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(),
+            void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(waveConditionsInput,
                                                                                    GetValidAssessmentLevel(),
-                                                                                   new HydraulicBoundaryData());
+                                                                                   new HydraulicBoundaryData
+                                                                                   {
+                                                                                       FilePath = dbFilePath
+                                                                                   });
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Er is geen hydraulische belastingendatabase geïmporteerd.", msgs[1]);
+                StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. " +
+                                        "Fout bij het lezen van bestand", msgs[1]);
                 CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
             });
 
             Assert.IsFalse(isValid);
         }
-
+        
         [Test]
         public void Validate_NoHydraulicBoundaryLocation_ReturnsFalseAndLogsValidationError()
         {