Add query tracking utility for use in tests.
Merge branch 'master' of github.com:CTPUG/wafer