Rename test and add couple more query tests.