Refactor change password spec