Cherry pick: Rename test category Failing->Failure