made changes for org selecton for all tests
made few more changes for org selecton