Fixed remote-query tests