Fix test fallout from bug 883358 so we can stop having a CLOSED TREE.  No review.