Update user model and tests