Fixing up the tests for python 3