Increase test coverage for Org Management Service and fix minor bug
Merge pull request #1066 from shenrie/master

Increase test coverage for Org Management Service and fix minor bug