Tests restructuring/minor Tokenizer refactoring