#8, #13: wrote JUnit tests for Tokenizer, refactored, and tuned it