Aggregate clean-up and unit tests