Merge "Fix broken tests due to uninitialized roots." into nyc-dev