etcd: move util to test