Replaced orgId with orgName in UserRole-class.
Fixed a small test
Added last test-fix of org ID --> org name