Fixed tests and tree no longer extends node
Tree can now have sub and supertrees. Commented out timemachine test, needs refactoring