More dependency injection for more test coverage