Cleaning up the rspecs...