Some Cleanup of NioFileWatcher and Test