fix some more zalgo corner cases and add more tests