Fix AggregateResource I broke, and add test to keep it from happening again