Updated Exception Handling
Added test for ServiceFactory
Groundwork for finding event id