Various updates to user model and tests