Updated test to use latest M&C aggregation definition for the test structure.