correct code style 1/2 & correct events, streams test