Token Pass testing updates