Minor tweaks to improve test runs