Updated boolean query tests