Address review comment and fix defult test cases
Address review comment and fix defult test cases

cisco/cisco-network-node-utils,chrisvanheuveln/cisco-network-node-utils,chrisvanheuveln/cisco-network-node-utils,cisco/cisco-network-node-utils