Tweak on query tests; should work on this!! :D