Updates from review, fixed tests

Changes that came from the PR review:
https://github.com/markfisher/xdzk/pull/17

Modified the AdminContainerObserverTest to work with the new
application context (as opposed to a static singleton).