Refactor NewEtcdHelper to take an etcd client