Refactoring/using more DI
Adding more tests for the images