Clean up EventLoggingListenerSuite + modify a few comments