Python 3 changes for test suite to run correctly.