Minor tweaks to allow faster test runs.