Refactor int tests to use external etcd