Dependency injection, proper tests