More tests, get rid of token identifier feature