Some changes to the listener test. Again, this succeeds over and over on my machine.