Minor tweaks to tests