Rename tstquery to test_query