Change to array based aggregation
Converting tests to use array