Removing accidental etcd test dependency

plus doing some ick to avoid multiple calls to `done` :scream_cat: