Updated User model and User test