typo and more accurate query tests