test-battery: fix test header

Previously suites that are unable to register will cause the test header
to hang. This should fix it.

And improve the style.