Merge commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4' * commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4': Change _TOKENIZE tests to test the new token_index column
Merge commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4' * commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4': Change _TOKENIZE tests to test the new token_index column