Tokenizer
Refactoring of the test suite.