Unreviewed test gardening, rebaseline tests after r242757.