Refactored event bus a bit, clean tests!
Minor formatting