Bug 1007334 - Followup: More test futzing for readability and Waldo-appeasement on a CLOSED TREE. (r=test-only)