Trying to fix tokenizer issue with running test cases