Unreviewed gardening. Update several test expectations after r234839.