New test file for watch nodes, minor fixes for Watch and WatchImage