Tweaks to the test