Merge "Add unit test for keypairs_client"