Handle disconnects better in test watch assertion