Test Tokenizer
Clean up Tokenizer
None is not a valid literal
Test and fix line numbering.