Changes made to THhelper and GroupByTest