refactored rspecs a little