Mac test expectation corrections after r150545.