Added Special case for node Swapping
Fixed test assert (parent)

Signed-off-by: 9drashijin <9drashijin@live.com>