Refactoring rspecs 2