Re-apply TestHelp.py fix