JBQA-8350 - Implement tests for the Remote Queries feature

Fix test failure introduced by improper rebasing.