Merge "Fix more broken tests" into nyc-mr1-dev