Fixed node functional tests. A couple of changes to the old_node model and node contr...