Unreviewed. Added new test expectations after r146072.