First (sanity) test passing, fixed class recusion

(Subtrees are now created as needed. Hopefully. That's what tests are
for, right?)