Added some more rspecs. Fixed some error messages