Testing Singleton Patterns

Refactor global state access to enable independent testing of components relying on single instances.