Refactored User Spec