Update Tree tests; resolve minor issues
resolve merge conflict