More TDD approach
Refactor classes and adjust dep injection