More progress. All TokenUtils tests pass.