Merge "Add unit test for aggregates_client"