More tokenizer tests + fix