Refactor "make test" as well.
Delete unused old test data/utils.