Refactored rspecs with subject and should