Get more old attribute tests passing