Upgrade from RSpec 2 to RSpec 3