Implemented unit tests for node class & merged conflicts