Make short_name_criterion collection test more reliable.