Minor test fix (clean up listeners on teardown)