Hacking up the tests for python 3