Slight fix on main node class and more tests!