[fix] fixing tests to reflect new package layout for queries