Change the ServiceLocator to be a tetable Singleton instead of being static
Track ReSherper settings