CFY-1433 start testing node instance removal, fix related bug