Updates event source implementations, removes old infrastructure, adds a
unit test for event source