Clean up dbdeploy tests prior to major refactoring