Switching to constructor DI for easier testing
Converting to unit test with mocking for improved speed & checking