Well - only 3 of the new tests that I added. There are a handful of other tests in this file that don't care about listeners at all. Of course I'm open to making it a field if you think it's cleaner.