Merge change 1575 into donut

* changes:
  Change _TOKENIZE tests to test the new token_index column