EventBus refactor and echo test suite