Upgrade to new RSpec syntax