Fix tests
add Consumer shell
prematurely added eventdispatcher