Add a high-level test of query(), showing the resolution of #160

Add a high-level test of query(), showing the resolution of #160 #282