- fixed the unmapped related tests for the calc aggregators
- cleanup