added more queries to the test for all options in org-name