adjust tests for watchdog removal + onEvent change