tokens test improvements.