Merge "Rename autogenerated tests to avoid confusion."