Added some more test code. Debugging marginal tree trav.