Got GenEvent involved in the Unit Test
Changed DI argument style