some fixes for the org test cases
Merge pull request #930 from kbidarkar/fix-org-tests-jun26

some fixes for the org test cases