improved test cases for name resolving from watch service