Improvements to QueryTest Page