Fixing bulk test case
Dealing with more of the network-based test cases
Merge branch 'jb_unit_tests' into n1k-plugin