Remove expected_event_types
from protocol
#964
Merged
expected_event_types
from protocol
#964