MODE-1807 - Changed the order of steps in the node validation algorithm and updated the test case that caused this issue