Refactored to Manager Registry only

- Also added dependency injection tests.