Bug 855086: Timeouts and empty tests aren't logged correctly.

Fixes test-unit-test to expect the new output. I also cleaned up that test a little so it's clear what we expect in each case.