Refactoring: Easier stubbing of the objects in the service locator