add more User model specs. Refactored others