rework tree tests