new tests,user switch default org, fixes #259
bugfix, failing test
Fix some indent and misspelled name
Merge branch 'asaleh-user-def-org-switch'