Refactor test_node

Change-Id: I70c48114fd523512f135d046fd331d3213cc8663