Needed to change the package for db_setup_test, and then remove all of the package references.
Moving all these old folders out of the scratch/ dir (general clean-up).