Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsDatabaseFileTest.cs
===================================================================
diff -u -r090bf03ca13a96b9e7c0a71b89f6853c303f7c02 -r4adc05fb0d7306ef1c21c56052193f526a4fad54
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsDatabaseFileTest.cs	(.../RingtoetsDatabaseFileTest.cs)	(revision 090bf03ca13a96b9e7c0a71b89f6853c303f7c02)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsDatabaseFileTest.cs	(.../RingtoetsDatabaseFileTest.cs)	(revision 4adc05fb0d7306ef1c21c56052193f526a4fad54)
@@ -81,7 +81,7 @@
         [TestCase("")]
         [TestCase("   ")]
         [TestCase(null)]
-        public void CreateStructure_QueryIsNullOrWhiteSpace_ThrowsArgumentException(string query)
+        public void ExecuteQuery_QueryIsNullOrWhiteSpace_ThrowsArgumentException(string query)
         {
             // Setup
             string filename = Path.GetRandomFileName();
@@ -93,7 +93,7 @@
                 databaseFile.OpenDatabaseConnection();
 
                 // Call
-                TestDelegate call = () => databaseFile.CreateStructure(query);
+                TestDelegate call = () => databaseFile.ExecuteQuery(query);
 
                 // Assert
                 string paramName = Assert.Throws<ArgumentException>(call).ParamName;
@@ -102,7 +102,7 @@
         }
 
         [Test]
-        public void CreateStructure_InvalidQuery_ThrowsSQLiteException()
+        public void ExecuteQuery_InvalidQuery_ThrowsSQLiteException()
         {
             // Setup
             string filename = Path.GetRandomFileName();
@@ -114,15 +114,15 @@
                 databaseFile.OpenDatabaseConnection();
 
                 // Call
-                TestDelegate call = () => databaseFile.CreateStructure("THIS WILL FAIL");
+                TestDelegate call = () => databaseFile.ExecuteQuery("THIS WILL FAIL");
 
                 // Assert
                 Assert.Throws<SQLiteException>(call);
             }
         }
 
         [Test]
-        public void CreateStructure_ValidQuery_CreatesFile()
+        public void ExecuteQuery_ValidQuery_CreatesFile()
         {
             // Setup
             string filename = Path.GetRandomFileName();
@@ -133,7 +133,7 @@
                 databaseFile.OpenDatabaseConnection();
 
                 // Call
-                databaseFile.CreateStructure(";");
+                databaseFile.ExecuteQuery(";");
 
                 // Assert
                 Assert.IsTrue(File.Exists(filePath));
@@ -143,71 +143,6 @@
         }
 
         [Test]
-        [TestCase("")]
-        [TestCase("   ")]
-        [TestCase(null)]
-        public void ExecuteMigration_QueryIsNullOrWhiteSpace_ThrowsArgumentException(string query)
-        {
-            // Setup
-            string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
-
-            using (new FileDisposeHelper(filePath))
-            using (var databaseFile = new RingtoetsDatabaseFile(filePath))
-            {
-                databaseFile.OpenDatabaseConnection();
-
-                // Call
-                TestDelegate call = () => databaseFile.ExecuteMigration(query);
-
-                // Assert
-                string paramName = Assert.Throws<ArgumentException>(call).ParamName;
-                Assert.AreEqual("query", paramName);
-            }
-        }
-
-        [Test]
-        public void ExecuteMigration_InvalidQuery_ThrowsSQLiteException()
-        {
-            // Setup
-            string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
-
-            using (new FileDisposeHelper(filePath))
-            using (var databaseFile = new RingtoetsDatabaseFile(filePath))
-            {
-                databaseFile.OpenDatabaseConnection();
-
-                // Call
-                TestDelegate call = () => databaseFile.ExecuteMigration("THIS WILL FAIL");
-
-                // Assert
-                Assert.Throws<SQLiteException>(call);
-            }
-        }
-
-        [Test]
-        public void ExecuteMigration_ValidQuery_CreatesFile()
-        {
-            // Setup
-            string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
-
-            using (var databaseFile = new RingtoetsDatabaseFile(filePath))
-            {
-                databaseFile.OpenDatabaseConnection();
-
-                // Call
-                databaseFile.ExecuteMigration(";");
-
-                // Assert
-                Assert.IsTrue(File.Exists(filePath));
-            }
-
-            using (new FileDisposeHelper(filePath)) {}
-        }
-
-        [Test]
         public void Dispose_AlreadyDisposed_DoesNotThrowException()
         {
             // Setup