Merge "Remove duplicate test classes"