updated plain text tokenizer and related tests