Updated user model and tests