minor tweaks in the query tests