* clean up duplicated user creation code * remove unused duplicate getOrCreateOrg function * fix up tests