Tweak Tokens to enable testing