Unify test class names