More test runner tweaks