Start of support for watching just files
Watcing files works. Unwatching files doesn't work.
Re-enabled directory unit tests
Unwatching files works