Report timeout after test errors

That's the order in which they happen chronologically, so this makes more sense.
Merge pull request #55 from pereckerdal/error-timeout-ordering

Report timeout after test error