Refactoring tests nodes on tree