Produce indented HTML output
Fix some tests