Finished the tests for Tokenizer
All the tests pass...
Tests are passing, but needs cleaning up