improved test cases for directory watch service tests