simplify name of cl in tests