Moving to another eventbus.
Adopting tests for it,