Preparation for possible addition of management bundle

Fixes to unit test suite and other code to allow for the addition of additional service bundles as they become required.