Fixed some failed tests on GPDB4.1