Fixing a few problems with the aggregator_spec and formatting some tests there.