Merge "Cleanup test method names."