Fix Python 3 test failures