adding multi column group by options and sample test