fixup! Fix up tests for cell aggregates