Tweaks to black box test runner.