Patched unit tests to be python 2.x compatible