Fixing tests for python3