Query test fix

Query test fix