Few fixes for user-tests and org-tests
Merge pull request #924 from kbidarkar/fix-user-tests

Few fixes for user-tests and org-tests