node identifier indicator unit tests
reorge