Add tests for Query\Runner, etc.
Fix comment.