fixed tokens test. some cleanup.