Tweaks to tests