Tokenizer renamed as Scanner
All tests passed