Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs
===================================================================
diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -r2ae1c9433c3c28b32105b9778b682b5e512a0f00
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs	(.../SqLiteDatabaseHelperTest.cs)	(revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs	(.../SqLiteDatabaseHelperTest.cs)	(revision 2ae1c9433c3c28b32105b9778b682b5e512a0f00)
@@ -67,19 +67,14 @@
             string validPath = Path.Combine(testDataPath, "tempFile.rtd");
             const string invalidScript = "SELECT '' FROM *;";
 
-            // Call
-            try
+            using (new FileDisposeHelper(validPath))
             {
-                SqLiteDatabaseHelper.CreateDatabaseFile(validPath, invalidScript);
+                // Call
+                TestDelegate test = () => SqLiteDatabaseHelper.CreateDatabaseFile(validPath, invalidScript);
 
                 // Assert
-                Assert.Fail("Should have thrown 'SQLiteException'");
+                Assert.Throws<SQLiteException>(test);
             }
-            catch (SQLiteException) {}
-            finally
-            {
-                SqLiteDatabaseHelper.TearDownTempFile(validPath);
-            }
         }
 
         [Test]
@@ -89,23 +84,15 @@
             string validPath = Path.Combine(testDataPath, "tempFile.rtd");
             const string validScript = "select * from sqlite_master;";
 
-            // Call
-            try
+            using (new FileDisposeHelper(validPath))
             {
-                SqLiteDatabaseHelper.CreateDatabaseFile(validPath, validScript);
+                // Call
+                TestDelegate test = () => SqLiteDatabaseHelper.CreateDatabaseFile(validPath, validScript);
 
                 // Assert
-                File.Exists(validPath);
+                Assert.DoesNotThrow(test);
+                Assert.IsTrue(File.Exists(validPath));
             }
-            catch (SQLiteException)
-            {
-                // Assert
-                Assert.Fail("Should not throw 'SQLiteException'");
-            }
-            finally
-            {
-                SqLiteDatabaseHelper.TearDownTempFile(validPath);
-            }
         }
 
         [Test]
@@ -115,26 +102,20 @@
             string validPath = Path.Combine(testDataPath, "tempFile.rtd");
             const string validScript = "select * from sqlite_master;";
 
-            // Precondition
-            SQLiteConnection.CreateFile(validPath);
-
-            // Call
-            try
+            using (var fileDisposeHelper = new FileDisposeHelper(validPath))
             {
-                SqLiteDatabaseHelper.CreateDatabaseFile(validPath, validScript);
+                fileDisposeHelper.CreateFile();
 
+                // Call
+                TestDelegate test = () => SqLiteDatabaseHelper.CreateDatabaseFile(validPath, validScript);
+
                 // Assert
+                Assert.DoesNotThrow(test);
+                Assert.IsTrue(File.Exists(validPath));
+
+                // Assert
                 File.Exists(validPath);
             }
-            catch (SQLiteException)
-            {
-                // Assert
-                Assert.Fail("Should not throw 'SQLiteException'");
-            }
-            finally
-            {
-                SqLiteDatabaseHelper.TearDownTempFile(validPath);
-            }
         }
 
         [Test]
@@ -144,8 +125,7 @@
             string validPath = Path.Combine(testDataPath, "tempFile.rtd");
             const string validScript = ";";
 
-            // Precondition
-            try
+            using (new FileDisposeHelper(validPath))
             {
                 using (File.Create(validPath))
                 {
@@ -156,59 +136,25 @@
                     Assert.Throws<IOException>(test);
                 }
             }
-            finally
-            {
-                SqLiteDatabaseHelper.TearDownTempFile(validPath);
-            }
         }
 
         [Test]
-        public void CreateValidRingtoetsDatabase_NullPath_ThrowsArgumentException()
-        {
-            // Setup
-            MockRepository mockRepository = new MockRepository();
-            var projectMock = mockRepository.StrictMock<Project>();
-
-            // Call
-            TestDelegate test = () => SqLiteDatabaseHelper.CreateValidRingtoetsDatabase(null, projectMock);
-
-            // Assert
-            Assert.Throws<ArgumentException>(test);
-        }
-
-        [Test]
-        public void CreateValidRingtoetsDatabase_NullProject_ThrowsArgumentNullException()
-        {
-            // Setup
-            string validPath = Path.Combine(testDataPath, "tempFile.rtd");
-
-            // Call
-            TestDelegate test = () => SqLiteDatabaseHelper.CreateValidRingtoetsDatabase(validPath, null);
-
-            // Assert
-            Assert.Throws<ArgumentNullException>(test);
-
-            // TearDown
-            SqLiteDatabaseHelper.TearDownTempFile(validPath);
-        }
-
-        [Test]
         public void CreateValidRingtoetsDatabase_ValidArguments_SavesProjectToFile()
         {
             // Setup
             string validPath = Path.Combine(testDataPath, "tempFile.rtd");
             MockRepository mockRepository = new MockRepository();
             var projectMock = mockRepository.StrictMock<Project>();
 
-            // Call
-            TestDelegate test = () => SqLiteDatabaseHelper.CreateValidRingtoetsDatabase(validPath, projectMock);
+            using (new FileDisposeHelper(validPath))
+            {
+                // Call
+                TestDelegate test = () => SqLiteDatabaseHelper.CreateValidRingtoetsDatabase(validPath, projectMock);
 
-            // Assert
-            Assert.DoesNotThrow(test);
-            Assert.IsTrue(File.Exists(validPath));
-
-            // TearDown
-            SqLiteDatabaseHelper.TearDownTempFile(validPath);
+                // Assert
+                Assert.DoesNotThrow(test);
+                Assert.IsTrue(File.Exists(validPath));
+            }
         }
 
         [Test]