Passing current tests except for tree dump in test2