FIXUP - move GFileMonitor workaround from test into main code