Update to RSpec3, Add retry for all 404s