Update query assertion script
Squash some bugs, add some more terms
Make the example slightly less bad