:white_check_mark: Added tests for `where`, fix EventMatcher