More refactoring in user spec