Fix race with etcd watch in tests