- Fixed Aggregator deletion and delegates
- Updated unit tests