Merge "Remove duplicated test cases." into nyc-dev