Removed consolidated (end) node optimization (see #100). Fixed some unreachable node tests