added token to User and refactored some specs