Restructured the tests
Ensure nodes in the tree are uniquely identified (closes #17)