Cleaning up the test helper

Some requires were obsolete and loading nothing.
Loosen up the dependency on phony