Increase test coverage for Org Management Service and fix minor bug