Fixing tests for python 3