Test fix

These are just some minor fixes to work with the `etcd.NewClient()` now taking an argument (https://github.com/coreos/go-etcd/commit/8a9f86831ad2fe5d260f8320cddc2dafb7b0ff9d).