Tokenizer: moved test-only tokenize() to SimpleTokenizer / several cleanups

Tokenizer: moved test-only tokenize() to SimpleTokenizer / several cleanups #13820