Add rest of UnitNode implementation, more tests