Merge "Removed test cases that test moved methods" into nyc-dev