* Fix tests code to prevent some runtime errors * Reduce nesting
* Improve ErrOrgNotExist type Return new error type Use good error check Use new method to check error Update tests * Fix unchanged method name report