update tests
unicode fix
unicode using six
I changed these too, although I'm not sure if I'm supposed to
subsequently, these were changed as well
Fix unicode test to be compatible with python 3.2

Python 3.3 was fine because they re-added the u'...' syntax to make
porting easier lol
Merge pull request #341 from mpharrigan/unicode_fix

Unicode fix