Added logic to assist with post-add-nodes-test cleanup