Unreviewed, more Mac test gardening after r190629.