simplify class names in tests