Fixed already by previous patch, only test added.
Should be unneeded with Python 2.7 and up. Added some unicode_literals along the way.