This change will also move us to bok-choy instead of lettuce for these scenarios, and re-enable them. See TE-736. Includes some refactoring of repeated event-checking code as well.
