More sensible name for listener
Hook into more sensible events for multi-suite
Only run for certain suites