fixed failing tests which rely on watch nodes