Tests restructuring/minor Tokenizer refactoring
Merge branch 'master' of https://github.com/hiisi13/Parrot