Changed verification for few test cases...

- There were test cases which was having verification on Watch node, so I replaced those with correct nodes.
- Also did some corrections for previous pull request (https://github.com/ikeough/Dynamo/pull/943 )