fix tokenizer
add highlight test