Rename base levels for examples/tests sets to "-set" notation
refactoring for nodes
examples and test fix