fixed failing tests which rely on watch nodes
Merge pull request #2256 from Steell/master

Fix Unit Tests that rely on Watch node