Add yet more wait tests inside interrupts.