Refactored rspecs