Fixed non node type
Refactoring tests
V1.2