test_org: Fixed few test cases related to orgs in UI
Merge pull request #942 from kbidarkar/fixorg-jun30

test_org: Fixed few test cases related to orgs for UI