Updated tokenizer tests