Some test-case cleanup and making more tests pass
Merge branch 'jb_unit_tests' into n1k-plugin