Add code to have inserted order preserved HASH aggregations for certain interesting cases