Fixing email and user tests