Convert ape trees to forest trees

At the same time clean up a bunch of old stuff from the tests
that bootstrapped us to this point.