fix some test case
add group by class