Rebaseline some tests after r169260