Adds more Aggregator classes
Make corresponding hpp an dependncy for test compilation