Merge "Add unit test for method list_aggregates"