Token/Charge testing updates