Fix new integration tests in Python 3