Merge "Move tests from tests/ root dir to appropriate directory." into nyc-mr1-dev