Merge "Fix Rename Document tests" into nyc-dev