Expanded QueryOptions class and tests