1. Added Changes as per review comments.
2. Added a test case for client.go. (Need to think of a
method to start the etcd/backend server from the testcase
Currently etcd needs to be started manually)