made changes to select org for gpg tests
made changes as per review comments and few more new tests
made changes as per review comments
removed wait_for_ajax
resolved conflict
Merge pull request #501 from sghai/fix-gpg-org

made changes to select org for gpg tests