Adjust Tests for Dependency Injection #2