Fix unit Tests using Dependency Injection