Make tests pass in python3
fixup! futurize stage 1
fixup! futurize stage 2
fixup! Make tests pass in python3
Fix more tests for python 3