Test tweaks
User creation tweaks