NOJIRA Added utility classes
NOJIRA Added node and map tests
NOJIRA Removed unused import