More work on aggregates plus another test case