Refactor aggregate test to new model.