Upgraded some tests to the new rspec syntax