Turned off space-to-underscore for tol, which uses spaces.
Added some other trees to test against.