fix event handler for self test type