Change keypair client to return one value and update tests

Partially implements: blueprint clients-return-one-value

Change-Id: Ief3c882164917062f1874182ba9ab1732f347d0d
10 files changed