Ensure databases get deleted after the tests are run
Fix deletestore tests