Merge "Add unit test for agents_client"