Some changes to the listener test. Again, this succeeds over and over on my machine.
Merge pull request #290 from alxdarksage/controller-tests

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