Try again with listen watcher test

I think/hope this might be solved by
86a053a1cc9d825a987c1c7fdd84b79a25293989 and
14df23d8aea91b442fd57580ba6846a2cfdabd5f.

Time will tell...