#195 added more query tests