more tokens and tests