Add integration tests to tox, related fixes