Fixing tests which could fail on py3 (due to dict order), prefixed some added tokens with '_'.