Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.

- fix unit tests for watermarks, which check for deleted files.
Merge pull request #154 from shadlaws/master

Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.