ENG-5360-test: add tests for query timeout.

Just the test modified no merge from master.