Refactor user spec