update spec files after rspec upgrade
preparing to merge with master