Fixed my tests, added some dependency injection