We should probably add the event handler module to this and then use `addEvent` here for the tests