Port to RSpec 3