Rename back to query_test