Improve dependency injection to improve testability

[olejnjak]

Right e.g. writing data to files can (and should be) extracted to separate service/object so it can be tested.

And also part of this issue should be writing those tests.