Updated the test for query comments so that we can check it's really working.
Fixed checkstyle issues.  Oops.