Fix the integration tests for Python2 & 3