clean up how test tokens are generated