Remove unused methods
Modify base test class
Add tests for the file system watch service