Update User class and tests after 6.5 Exercises