Fix test failures caused by python2.7 updating
Fix test failures caused by renaming fields of list query