Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicBoundaryDataCreateExtensionsTest.cs
===================================================================
diff -u -rb83402bba94b85daeef0c515b90aba9f57400663 -rd806ca7ca5b084d83e01a7a4c25278451ddaa00f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicBoundaryDataCreateExtensionsTest.cs	(.../HydraulicBoundaryDataCreateExtensionsTest.cs)	(revision b83402bba94b85daeef0c515b90aba9f57400663)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicBoundaryDataCreateExtensionsTest.cs	(.../HydraulicBoundaryDataCreateExtensionsTest.cs)	(revision d806ca7ca5b084d83e01a7a4c25278451ddaa00f)
@@ -57,36 +57,30 @@
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void Create_ValidHydraulicBoundaryData_ReturnsHydraulicBoundaryDataEntity(bool withScenarioInformation)
+        public void Create_ValidHydraulicBoundaryData_ReturnsHydraulicBoundaryDataEntity()
         {
             // Setup
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
                 HydraulicLocationConfigurationDatabase =
                 {
-                    FilePath = "hlcdFilePath"
+                    FilePath = "hlcdFilePath",
+                    ScenarioName = "ScenarioName",
+                    Year = new Random(21).Next(),
+                    Scope = "Scope",
+                    SeaLevel = "SeaLevel",
+                    RiverDischarge = "RiverDischarge",
+                    LakeLevel = "LakeLevel",
+                    WindDirection = "WindDirection",
+                    WindSpeed = "WindSpeed",
+                    Comment = "Comment"
                 },
                 HydraulicBoundaryDatabases =
                 {
                     new HydraulicBoundaryDatabase()
                 }
             };
 
-            if (withScenarioInformation)
-            {
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.ScenarioName = "ScenarioName";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.Year = new Random(21).Next();
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.Scope = "Scope";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.SeaLevel = "SeaLevel";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.RiverDischarge = "RiverDischarge";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.LakeLevel = "LakeLevel";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.WindDirection = "WindDirection";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.WindSpeed = "WindSpeed";
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.Comment = "Comment";
-            }
-
             // Call
             HydraulicBoundaryDataEntity entity = hydraulicBoundaryData.Create(new PersistenceRegistry());
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs
===================================================================
diff -u -rb83402bba94b85daeef0c515b90aba9f57400663 -rd806ca7ca5b084d83e01a7a4c25278451ddaa00f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDataEntityReadExtensionsTest.cs)	(revision b83402bba94b85daeef0c515b90aba9f57400663)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDataEntityReadExtensionsTest.cs)	(revision d806ca7ca5b084d83e01a7a4c25278451ddaa00f)
@@ -70,33 +70,27 @@
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void Read_WithValidEntity_UpdatesHydraulicBoundaryData(bool withScenarioInformation)
+        public void Read_WithValidEntity_UpdatesHydraulicBoundaryData()
         {
             // Setup
             var entity = new HydraulicBoundaryDataEntity
             {
                 HydraulicLocationConfigurationDatabaseFilePath = "hlcdFilePath",
+                HydraulicLocationConfigurationDatabaseScenarioName = "ScenarioName",
+                HydraulicLocationConfigurationDatabaseYear = new Random(21).Next(),
+                HydraulicLocationConfigurationDatabaseScope = "Scope",
+                HydraulicLocationConfigurationDatabaseSeaLevel = "SeaLevel",
+                HydraulicLocationConfigurationDatabaseRiverDischarge = "RiverDischarge",
+                HydraulicLocationConfigurationDatabaseLakeLevel = "LakeLevel",
+                HydraulicLocationConfigurationDatabaseWindDirection = "WindDirection",
+                HydraulicLocationConfigurationDatabaseWindSpeed = "WindSpeed",
+                HydraulicLocationConfigurationDatabaseComment = "Comment",
                 HydraulicBoundaryDatabaseEntities =
                 {
                     new HydraulicBoundaryDatabaseEntity()
                 }
             };
 
-            if (withScenarioInformation)
-            {
-                entity.HydraulicLocationConfigurationDatabaseScenarioName = "ScenarioName";
-                entity.HydraulicLocationConfigurationDatabaseYear = new Random(21).Next();
-                entity.HydraulicLocationConfigurationDatabaseScope = "Scope";
-                entity.HydraulicLocationConfigurationDatabaseSeaLevel = "SeaLevel";
-                entity.HydraulicLocationConfigurationDatabaseRiverDischarge = "RiverDischarge";
-                entity.HydraulicLocationConfigurationDatabaseLakeLevel = "LakeLevel";
-                entity.HydraulicLocationConfigurationDatabaseWindDirection = "WindDirection";
-                entity.HydraulicLocationConfigurationDatabaseWindSpeed = "WindSpeed";
-                entity.HydraulicLocationConfigurationDatabaseComment = "Comment";
-            }
-
             var hydraulicBoundaryData = new HydraulicBoundaryData();
 
             // Call