Updated Tokenizer tests with new tag tests.
Refactoring Tokenizer tests.