Minor tweaks for test runs.