Adding capability to go deeper into the tree for the node mapper.
Refactoring tests.