Update TokenTest with the new Token code