Tweaks to TestHelpers.py