Merge "Fix CP2 unit tests" into nyc-dev