add query tests