Added first version of query tests