Merge "Change keypair client to return one value and update tests"