Added test to test against adding a client for roles other than user. and pulling
fixed merge conflict in add_client_spec