Unreviewed gardening. Update expectations for new tests added in r230953.