Adding output for junit.

Instead of being based on collections, with iterations inside them,
I've moved iterations up to the top of the hierarchy. Makes for results
that make better sense.