No more Dependency Injection, Refactoring Again and all Test Passing Against DB