a minor clean up and add more tests for xml tokenizer