Refactor Database tests to run standalone.