fix tests, groupByNode, simplify names