minor tweaks, fixed query test