The bug fixes from last week caused several test failures because of the
way services were refactored. This commit fixes that and also repairs
some extensions. The tests will not yet work in the build because of
some class circularity issues.


Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>