Refactored user spec