bug628796: Now numbers the failures as it lists them, and also some bug fixes