Updated User model and tests