Full migration to RSpec 3