Unreviewed, rebaseline a few tests after r220779.