etcd test updated and simplified