Fix broken py3 tests