improved tokens test.