Add aggregator tests
Rename derive aggregator. Restructure service