move the rest of the tests to use tokens