Clean up event listener; fix warning in test

[MetRonnie]

Missed this out in #1802

Plus fix warning in test missed in #1794

Check List

• [x] I have read CONTRIBUTING.md and added my name as a Code Contributor.
• [x] Contains logically grouped changes (else tidy your branch by rebase).
• [x] Does not contain off-topic changes (use other PRs for other changes).

[MetRonnie]

IMO we should get this in for 2.5.0