Tweaks to test running.