Better distinguish ambiguous taxon names
More tests