refactoring FileModificationWatcher tests that use a mock event service