#ARCH-66 Added Tests in Query Service