improve tests to confirm Query receives correct input
improve tests to confirm Query receives correct input

gds-operations/vcloud-core,UKHomeOffice/vcloud-core,UKHomeOffice/vcloud-core,gds-operations/vcloud-core