Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs
===================================================================
diff -u -rfc505a6a1ef0418da1856b654a184044c5470782 -r80f89273f0c6f5540a79ad871c976b942845fac6
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs	(.../HydraulicLocationConfigurationSettingsTest.cs)	(revision fc505a6a1ef0418da1856b654a184044c5470782)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs	(.../HydraulicLocationConfigurationSettingsTest.cs)	(revision 80f89273f0c6f5540a79ad871c976b942845fac6)
@@ -152,6 +152,7 @@
                                windDirection, windSpeed, comment);
 
             // Assert
+            Assert.AreEqual(filePath, settings.FilePath);
             Assert.AreEqual(scenarioName, settings.ScenarioName);
             Assert.AreEqual(year, settings.Year);
             Assert.AreEqual(scope, settings.Scope);
@@ -162,5 +163,35 @@
             Assert.AreEqual(windSpeed, settings.WindSpeed);
             Assert.AreEqual(comment, settings.Comment);
         }
+
+        [Test]
+        public void SetValues_OptionalArgumentsNull_SetsExpectedValues()
+        {
+            // Setup
+            var random = new Random(21);
+            const string filePath = "FilePath";
+            const string scenarioName = "ScenarioName";
+            int year = random.Next();
+            const string scope = "Scope";
+
+            var settings = new HydraulicLocationConfigurationSettings();
+
+            // Call
+            settings.SetValues(filePath, scenarioName, year, scope, 
+                               null, null, null, null, null, null);
+
+            // Assert
+            Assert.AreEqual(filePath, settings.FilePath);
+            Assert.AreEqual(scenarioName, settings.ScenarioName);
+            Assert.AreEqual(year, settings.Year);
+            Assert.AreEqual(scope, settings.Scope);
+
+            Assert.IsNull(settings.SeaLevel);
+            Assert.IsNull(settings.RiverDischarge);
+            Assert.IsNull(settings.LakeLevel);
+            Assert.IsNull(settings.WindDirection);
+            Assert.IsNull(settings.WindSpeed);
+            Assert.IsNull(settings.Comment);
+        }
     }
 }
\ No newline at end of file