Fixing signatures of WatchListener
Adding test dirver