The main change is to use --reuse-db when running make test. The other changes are mostly preconditions for that.
--reuse-db
make test