GPII-290: Return token(s) as JSON

Two small changes to make the tests run with my changes to GetToken.js.