Fix watchdog tests