all tests passing with new token api