Revert "Track Universal Tree for Test"

This reverts commit c4e512b42d1e1cfa29620be1bd380d284bba7c04.