Convert to the latest rspec syntax