Reinstate query (non-batch, non-paging) tests. Inadvertently removed