Added list_queries() and assert_max_queries()