Fix the setup-custom-org-with-content func
Merge pull request #969 from kbidarkar/fix-delete-org-tests

Fix the setup-custom-org-with-content func