Refactoring of some tests, more tests work
Merge branch 'n1k-plugin' into jb_unit_tests
Merge branch 'jb_unit_tests' into n1k-plugin