Sort out TokenUtils tests