Fix Tokenizer so that it actually sets the tokenizer. More tests.