Adjust the tests for python 3