cr comments mainly related to rspecs