first pass at fixing/updating rspecs