Index: Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs
===================================================================
diff -u -r0e47995b4f0f12b6327b97b5b9e49089e91b4b8f -r9c399379721aee0894240e9d344517cea7e2c6ec
--- Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs	(.../HydraRingSettingsDatabaseReaderTest.cs)	(revision 0e47995b4f0f12b6327b97b5b9e49089e91b4b8f)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs	(.../HydraRingSettingsDatabaseReaderTest.cs)	(revision 9c399379721aee0894240e9d344517cea7e2c6ec)
@@ -154,28 +154,15 @@
         }
 
         [Test]
-        public void ReadTimeIntegrationSetting_InvalidValueInReadLocation_ThrowsCriticalFileReadException()
+        [TestCase(invalidDatabase, 700131)]
+        [TestCase(invalidDatabaseWithOptionalColumns, 700131)]
+        [TestCase(invalidDatabaseWithOptionalColumns, 700132)]
+        public void ReadTimeIntegrationSetting_InvalidValueInReadLocation_ThrowsCriticalFileReadException(string databaseName, long locationId)
         {
             // Setup
-            using (var reader = new HydraRingSettingsDatabaseReader(GetDatabasePath(invalidDatabase)))
+            using (var reader = new HydraRingSettingsDatabaseReader(GetDatabasePath(databaseName)))
             {
                 // Call
-                TestDelegate test = () => reader.ReadTimeIntegrationSetting(700131, HydraRingFailureMechanismType.AssessmentLevel);
-
-                // Assert
-                Assert.Throws<CriticalFileReadException>(test);
-            }
-        }
-
-        [Test]
-        [TestCase(700131)]
-        [TestCase(700132)]
-        public void ReadTimeIntegrationSetting_InvalidValueInReadLocationForOptionalColumn_ThrowsCriticalFileReadException(long locationId)
-        {
-            // Setup
-            using (var reader = new HydraRingSettingsDatabaseReader(GetDatabasePath(invalidDatabaseWithOptionalColumns)))
-            {
-                // Call
                 TestDelegate test = () => reader.ReadTimeIntegrationSetting(locationId, HydraRingFailureMechanismType.AssessmentLevel);
 
                 // Assert
@@ -184,16 +171,20 @@
         }
 
         [Test]
-        [TestCase(700131, 0, 1, 3, 1)]
-        [TestCase(700131, 3, 1, 3, 1)]
-        [TestCase(700134, 2, 1, 3, 1)]
-        [TestCase(700135, 4, 1, 3, 1)]
+        [TestCase(completeDatabase, 700131, 0, 1, 3, 1)]
+        [TestCase(completeDatabase, 700131, 3, 1, 3, 1)]
+        [TestCase(completeDatabase, 700134, 2, 1, 3, 1)]
+        [TestCase(completeDatabase, 700135, 4, 1, 3, 1)]
+        [TestCase(completeDatabaseWithOptionalColumns, 700131, 0, 1, 5, 0.7)]
+        [TestCase(completeDatabaseWithOptionalColumns, 700131, 3, 1, 5, 0.7)]
+        [TestCase(completeDatabaseWithOptionalColumns, 700134, 2, 1, 5, 0.7)]
+        [TestCase(completeDatabaseWithOptionalColumns, 700135, 4, 1, 5, 0.7)]
         public void ReadTimeIntegrationSetting_ValidLocationIdAndFailureMechanismType_TimeIntegrationSettingWithExpectedValues(
-            long locationId, HydraRingFailureMechanismType calculationType, int expectedTimeIntegrationScheme,
+            string databaseName, long locationId, HydraRingFailureMechanismType calculationType, int expectedTimeIntegrationScheme,
             int expectedMaxIterations, double expectedRelaxationFactor)
         {
             // Setup
-            using (var reader = new HydraRingSettingsDatabaseReader(GetDatabasePath(completeDatabase)))
+            using (var reader = new HydraRingSettingsDatabaseReader(GetDatabasePath(databaseName)))
             {
                 // Call
                 TimeIntegrationSetting setting = reader.ReadTimeIntegrationSetting(locationId, calculationType);
@@ -206,28 +197,6 @@
         }
 
         [Test]
-        [TestCase(700131, 0, 1, 5, 0.7)]
-        [TestCase(700131, 3, 1, 5, 0.7)]
-        [TestCase(700134, 2, 1, 5, 0.7)]
-        [TestCase(700135, 4, 1, 5, 0.7)]
-        public void ReadTimeIntegrationSetting_ValidLocationIdAndFailureMechanismTypeAndOptionalColumns_TimeIntegrationSettingWithExpectedValues(
-            long locationId, HydraRingFailureMechanismType calculationType, int expectedTimeIntegrationScheme,
-            int expectedMaxIterations, double expectedRelaxationFactor)
-        {
-            // Setup
-            using (var reader = new HydraRingSettingsDatabaseReader(GetDatabasePath(completeDatabaseWithOptionalColumns)))
-            {
-                // Call
-                TimeIntegrationSetting setting = reader.ReadTimeIntegrationSetting(locationId, calculationType);
-
-                // Assert
-                Assert.AreEqual(expectedTimeIntegrationScheme, setting.TimeIntegrationSchemeId);
-                Assert.AreEqual(expectedMaxIterations, setting.MaxIterations);
-                Assert.AreEqual(expectedRelaxationFactor, setting.RelaxationFactor);
-            }
-        }
-
-        [Test]
         [TestCase(15, 10)]
         [TestCase(0, 5)]
         public void ReadTimeIntegrationSetting_ValidLocationIdAndFailureMechanismTypeNotInDatabase_ReturnNull(long locationId, HydraRingFailureMechanismType calculationType)