Fixed failing Aggregator tests on master.

Fixes an unfortunate clash between #820 and #821 which were merged very close together.