(ActivityAggregation) Progress on content unit tests. Had to revamp aggregate selection and delivery logic as it was wrong.