Newly refactored dbdeploy passes all old tests