Various improvements to the JSON code and test reporting bits

But yeah - I'll fix this one. Consistency is a good thing.