Add aggregation apis, which remove complexity around lists and circular dep on location

Also start using MWS tests.