Added Tests and Aggregation Support