move to xmeans, update tests on tokenizer