Improve char-by-char parsing test, and fix a bug this revealed
Improve split parsing test, and fix a bug it reveals