Changes suggested at demo
WIP: working on query model tests