update per octest to xctest conversion.