Added test for orgs and client