Address @masylum's comments

- s/false/null
- Move event bus specific stuff to own spec scope