Some improvement to test coverage.

But not as much as I would like. It is difficult to test OutputWriters correctly as they are loading their collaborators explicitly. Time to have a look into Guice ...