Fixed list of nodes, changed tests