Improve tests for HDSQueryOperator.

Improve tests for HDSQueryOperator.