* clean up duplicated user creation code
* remove unused duplicate getOrCreateOrg function
* fix up tests
(cherry picked from commit 9350ab781c)
* clean up duplicated user creation code
* remove unused duplicate getOrCreateOrg function
* fix up tests
(cherry picked from commit 9350ab781c)