~ small refactoring (renaming of parameters, watch service event listener in abstract class)
+ test cases for watch service