Clean-up QueryPrinter tests

Change-Id: I2b4d603c42d7cdff1d25c76ad08ff75b8294a91e