Cleanup: Use new common helper function instead of private one
Cleanup of test pass/fail reporting mechanism