Add more tests
Added buffer and modified tokenize to use it