cleanup/refactor watcher_test.go

[#75728000]