Reorder test vectors so an untagged one come first if applicable.
Minor Unicode/encoding fixes.