Fully fix #74. Add another tokenizer test.