Update test cases for querying.