Updated UnityHandlerResolver, but need unit tests