Merge "Re-enable Jack for tests" into nyc-dev