Replace with a real test, still stupid but better than "DummyTest"
Fix up reports
Tidy, normalize goal prefix