Change bootstrap debug to be a function (not sure if there's any reason why it still needs to be a macro, look like not), and use new test.tree api