[#8] Improving QueryHandlerTest