More refactoring of resolvers.  Issues remain with the test refactoring now that there are so many singletons in play.