More tests pass
Merge branch 'jb_unit_tests' into n1k-plugin