SIT-637
removal of redundant code, test for the agg. strategy added