Update features for new tokenization, fix tests, retrain models