Reduced the number of items asserted when listening for events