Clean up tests
Add alternative listener attachment approach