Refactor Tree test to new model.