fix for nonmatch special case and failing abbreviation special case test