Merge "De-duplicate test class names"