Fix the test cases because of hash aggregate inlined