Update Dependency Injection and Unit Tests