bug628796: completed changes
bug628796: Reduced number of failures per failure type to make test results more readable