updated class User + testing