Updating User model and tests