TreeTests + minor changes to accomodate testing