Merge changes to add <div> tags to test output to stop the HTML escaping that's displayed.

Merging as a prerequisite to some JSON support changes.