Improvements to QueryOptionsTest

Change-Id: I662942c5186d656d01ef47ca121ac39f3e5d1c3b