Convert to RSpec 3.0.x syntax