be9feeb918
This is a lot simpler and removes the need for stubbing singletons in unit tests.
This is a lot simpler and removes the need for stubbing singletons in unit tests.