WIP: working on query model tests