Improve coverage on QuerGenerator