Fix up tests for cell aggregates

Change-Id: Ie8e2f31973f6f13c71e2348e91b026822f9515cf