More resilient watch test