add test_kind and test_query