Add tokenize test and fix bug