Updating to Python3 - Updating token functions to work with unicode (Fixed some failures in Python2)