Merge change 6004

* changes:
  Add aggregator test tag to list