Added unit tests + few bugfixes
Added few "two nodes" tests
Added tests (option "nodes")