Added more tests, furthered the tokenizer