fix test errors
event bus modifiactions