fix(tests): update events handling

close #45 #47