Merge "Fix unit tests" into nyc-dev