updated aggs to use partial dframe, tests passing