[WIP] Update query related tests