Merge "More run-test with Jack" into nyc-dev