More work on the resolver refactoring.  Unit tests breaking on ExamineManager.Instance