etcd: refactor tests