Refactor QueryTest to not use an inspector