flowp.files: refactorization of watch tests