Tweaks to test