Macro cleanup
Run the tree builder tests we don't fail

Prevent regressions.