Clean up after the file watcher test, & restructured the test to
be simpler. Also not to fail if the file isn't there to start with. Doh.