Cleaning unit test to use DI