Updated aggregation strategy and improved unit tests.