Ran the 2to3 tool on the code. Unit tests are broken due to more strict string handling in Python 3