Tweaks to user tests