More test runner tweaks.