Change to new-style RSpec syntax